Rebase

Dimitar Kerezov · Mitko-Kerezov · commit a9b14a31f5fd · 2017-04-26T15:11:38.000+03:00
diff --git a/lib/commands/test-init.ts b/lib/commands/test-init.ts
@@ -54,7 +54,11 @@ class TestInitCommand implements ICommand {
 				// e.g karma is installed; karma-jasmine depends on karma and will try to install it again
 				try {
 					await this.$npm.install(`${peerDependency}@${dependencyVersion}`, projectDir, {
-						'save-dev': true
+						'save-dev': true,
+						disableNpmInstall: false,
+						frameworkPath: this.$options.frameworkPath,
+						ignoreScripts: this.$options.ignoreScripts,
+						path: this.$options.path
 					});
 				} catch (e) {
 					this.$logger.error(e.message);
diff --git a/lib/services/extensibility-service.ts b/lib/services/extensibility-service.ts
@@ -32,13 +32,10 @@ export class ExtensibilityService implements IExtensibilityService {
 		const localPath = path.resolve(extensionName);
 		const packageName = this.$fs.exists(localPath) ? localPath : extensionName;
 
-		const realName = (await this.$npm.install(packageName, this.pathToExtensions, npmOpts))[0];
+		const installResultInfo = await this.$npm.install(packageName, this.pathToExtensions, npmOpts);
 		this.$logger.trace(`Finished installation of extension '${extensionName}'. Trying to load it now.`);
 
-		// In case the extension is already installed, the $npm.install method will not return the name of the package.
-		// Fallback to the original value.
-		// NOTE: This will not be required once $npm.install starts working correctly.
-		return await this.loadExtension(realName || extensionName);
+		return await this.loadExtension(installResultInfo.name);
 	}
 
 	@exported("extensibilityService")
diff --git a/test/services/extensibility-service.ts b/test/services/extensibility-service.ts
@@ -77,7 +77,7 @@ describe("extensibilityService", () => {
 					argsPassedToNpmInstall.packageName = packageName;
 					argsPassedToNpmInstall.pathToSave = pathToSave;
 					argsPassedToNpmInstall.config = config;
-					return [userSpecifiedValue];
+					return { name: userSpecifiedValue };
 				};
 
 				const extensibilityService: IExtensibilityService = testInjector.resolve(ExtensibilityService);
@@ -130,7 +130,7 @@ describe("extensibilityService", () => {
 			fs.readDirectory = (dir: string): string[] => [extensionName];
 
 			const npm: INodePackageManager = testInjector.resolve("npm");
-			npm.install = async (packageName: string, pathToSave: string, config?: any): Promise<any> => [extensionName];
+			npm.install = async (packageName: string, pathToSave: string, config?: any): Promise<any> => ({ name: extensionName });
 
 			const extensibilityService: IExtensibilityService = testInjector.resolve(ExtensibilityService);
 			const actualResult = await extensibilityService.installExtension(extensionName);
@@ -148,7 +148,7 @@ describe("extensibilityService", () => {
 			fs.readDirectory = (dir: string): string[] => [extensionName];
 
 			const npm: INodePackageManager = testInjector.resolve("npm");
-			npm.install = async (packageName: string, pathToSave: string, config?: any): Promise<any> => [extensionName];
+			npm.install = async (packageName: string, pathToSave: string, config?: any): Promise<any> => ({ name: extensionName });
 
 			const requireService: IRequireService = testInjector.resolve("requireService");
 			requireService.require = (pathToRequire: string) => {
@@ -230,7 +230,7 @@ describe("extensibilityService", () => {
 				npm.install = async (packageName: string, pathToSave: string, config?: any): Promise<any> => {
 					assert.deepEqual(packageName, extensionNames[0]);
 					isNpmInstallCalled = true;
-					return [packageName];
+					return { name: packageName };
 				};
 
 				const expectedResults: IExtensionData[] = _.map(extensionNames, extensionName => ({ extensionName }));
