fixed tests

Author: Plamen5kov

lib/declarations.ts

@@ -10,7 +10,7 @@ interface INpmInstallationManager {
 	getLatestVersion(packageName: string): IFuture<string>;
 	getNextVersion(packageName: string): IFuture<string>;
 	getLatestCompatibleVersion(packageName: string): IFuture<string>;
-	getInspectorFromCache(inspectorNpmPackageName: string): IFuture<string>;
+	getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string): IFuture<string>;
 }
 
 interface INpmInstallOptions {

lib/npm-installation-manager.ts

@@ -6,7 +6,6 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	private static NPM_LOAD_FAILED = "Failed to retrieve data from npm. Please try again a little bit later.";
 
 	constructor(private $npm: INodePackageManager,
-		private $projectData: IProjectData,
 		private $childProcess: IChildProcess,
 		private $logger: ILogger,
 		private $errors: IErrors,
@@ -59,9 +58,9 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		}).future<string>()();
 	}
 
-	public getInspectorFromCache(inspectorNpmPackageName: string) : IFuture<string> {
+	public getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string) : IFuture<string> {
 		return (() => {
-			let inspectorPath = path.join(this.$projectData.projectDir, "node_modules", inspectorNpmPackageName);
+			let inspectorPath = path.join(projectDir, "node_modules", inspectorNpmPackageName);
 
 			// local installation takes precedence over cache
 			if(!this.inspectorAlreadyInstalled(inspectorPath).wait()) {

lib/services/ios-debug-service.ts

@@ -214,7 +214,7 @@ class IOSDebugService implements IDebugService {
 	private openAppInspector(fileDescriptor: string): IFuture<void> {
 		if (this.$options.client) {
 			return (() => {
-				let  inspectorPath = this.$npmInstallationManager.getInspectorFromCache(inspectorNpmPackageName).wait();
+				let  inspectorPath = this.$npmInstallationManager.getInspectorFromCache(inspectorNpmPackageName, this.$projectData.projectDir).wait();
 
 				let inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
 				let inspectorApplicationPath = path.join(inspectorPath, inspectorAppName);

test/npm-installation-manager.ts

@@ -9,6 +9,7 @@ import * as OptionsLib from "../lib/options";
 import * as StaticConfigLib from "../lib/config";
 import Future = require("fibers/future");
 import * as yok from "../lib/common/yok";
+import ChildProcessLib = require("../lib/common/child-process");
 
 function createTestInjector(): IInjector {
 	let testInjector = new yok.Yok();
@@ -21,6 +22,7 @@ function createTestInjector(): IInjector {
 	testInjector.register("fs", FsLib.FileSystem);
 	testInjector.register("hostInfo", HostInfoLib.HostInfo);
 	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);
+	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
 
 	testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
 

test/stubs.ts

@@ -230,6 +230,10 @@ export class NpmInstallationManagerStub implements INpmInstallationManager {
 	getLatestCompatibleVersion(packageName: string): IFuture<string> {
 		return Future.fromResult("");
 	}
+
+	getInspectorFromCache(name: string, projectDir: string): IFuture<string> {
+		return Future.fromResult("");
+	}
 }
 
 export class ProjectDataStub implements IProjectData {