chore: Merge remote-tracking branch 'origin/release' into vladimirov/merge-rel-master

Author: rosen-vladimirov

CHANGELOG.md

@@ -1,6 +1,15 @@
 NativeScript CLI Changelog
 ================
 
+4.1.2 (2018, June 26)
+==
+
+### Fixed
+
+* [Fixed #2283](https://github.com/NativeScript/nativescript-cli/issues/2283): On adding test frameworks their peerDependencies are not installed
+* [Fixed #3689](https://github.com/NativeScript/nativescript-cli/issues/3689): `tns test <platform>` throws exception
+
+
 4.1.1 (2018, June 19)
 ==
 

lib/commands/test-init.ts

@@ -5,7 +5,11 @@ class TestInitCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	private frameworkDependencies: IDictionary<string[]> = {
-		mocha: ['chai'],
+		mocha: ['karma-chai', 'mocha'],
+	};
+
+	private karmaConfigAdditionalFrameworks: IDictionary<string[]> = {
+		mocha: ['chai']
 	};
 
 	constructor(private $npm: INodePackageManager,
@@ -30,19 +34,38 @@ class TestInitCommand implements ICommand {
 		}
 
 		const dependencies = this.frameworkDependencies[frameworkToInstall] || [];
-		const modulesToInstall = ['karma', 'karma-' + frameworkToInstall, 'karma-nativescript-launcher'].concat(dependencies.map(f => 'karma-' + f));
+		const modulesToInstall: IDependencyInformation[] = [
+			{
+				name: 'karma',
+				// Hardcode the version unitl https://github.com/karma-runner/karma/issues/3052 is fixed
+				version: "2.0.2"
+			},
+			{
+				name: `karma-${frameworkToInstall}`
+			},
+			{
+				name: 'karma-nativescript-launcher'
+			}
+		];
+
+		modulesToInstall.push(...dependencies.map(f => ({ name: f })));
 
 		for (const mod of modulesToInstall) {
-			await this.$npm.install(mod, projectDir, {
+			let moduleToInstall = mod.name;
+			if (mod.version) {
+				moduleToInstall += `@${mod.version}`;
+			}
+			await this.$npm.install(moduleToInstall, projectDir, {
 				'save-dev': true,
+				'save-exact': true,
 				optional: false,
 				disableNpmInstall: this.$options.disableNpmInstall,
 				frameworkPath: this.$options.frameworkPath,
 				ignoreScripts: this.$options.ignoreScripts,
 				path: this.$options.path
 			});
 
-			const modulePath = path.join(projectDir, "node_modules", mod);
+			const modulePath = path.join(projectDir, "node_modules", mod.name);
 			const modulePackageJsonPath = path.join(modulePath, "package.json");
 			const modulePackageJsonContent = this.$fs.readJson(modulePackageJsonPath);
 			const modulePeerDependencies = modulePackageJsonContent.peerDependencies || {};
@@ -55,6 +78,7 @@ class TestInitCommand implements ICommand {
 				try {
 					await this.$npm.install(`${peerDependency}@${dependencyVersion}`, projectDir, {
 						'save-dev': true,
+						'save-exact': true,
 						disableNpmInstall: false,
 						frameworkPath: this.$options.frameworkPath,
 						ignoreScripts: this.$options.ignoreScripts,
@@ -77,12 +101,11 @@ class TestInitCommand implements ICommand {
 
 		this.$fs.ensureDirectoryExists(testsDir);
 
+		const frameworks = [frameworkToInstall].concat(this.karmaConfigAdditionalFrameworks[frameworkToInstall] || [])
+			.map(fw => `'${fw}'`)
+			.join(', ');
 		const karmaConfTemplate = this.$resources.readText('test/karma.conf.js');
-		const karmaConf = _.template(karmaConfTemplate)({
-			frameworks: [frameworkToInstall].concat(dependencies)
-				.map(fw => `'${fw}'`)
-				.join(', ')
-		});
+		const karmaConf = _.template(karmaConfTemplate)({ frameworks });
 
 		this.$fs.writeFile(path.join(projectDir, 'karma.conf.js'), karmaConf);