fix test run after initial installation

Author: Stefan Dragnev

lib/constants.ts

@@ -13,6 +13,7 @@ export let NODE_MODULE_CACHE_PATH_KEY_NAME = "node-modules-cache-path";
 export let DEFAULT_APP_IDENTIFIER_PREFIX = "org.nativescript";
 export var LIVESYNC_EXCLUDED_DIRECTORIES = ["app_resources"];
 export var TESTING_FRAMEWORKS = ['jasmine', 'mocha'];
+export let TEST_RUNNER_NAME = "nativescript-unit-test-runner";
 
 export class ReleaseType {
 	static MAJOR = "major";

lib/services/platform-service.ts

@@ -9,7 +9,6 @@ import * as semver from "semver";
 
 export class PlatformService implements IPlatformService {
 	private static TNS_MODULES_FOLDER_NAME = "tns_modules";
-	private static TNS_UNIT_TEST_RUNNER = "nativescript-unit-test-runner";
 
 	constructor(private $devicesServices: Mobile.IDevicesServices,
 		private $errors: IErrors,
@@ -196,8 +195,8 @@ export class PlatformService implements IPlatformService {
 				let tnsModulesDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, PlatformService.TNS_MODULES_FOLDER_NAME);
 				this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, platform, lastModifiedTime).wait();
 
-				let testRunnerSourcePath = path.join(this.$projectData.projectDir, 'node_modules', PlatformService.TNS_UNIT_TEST_RUNNER);
-				shell.rm("-rf", path.join(tnsModulesDestinationPath, PlatformService.TNS_UNIT_TEST_RUNNER));
+				let testRunnerSourcePath = path.join(this.$projectData.projectDir, 'node_modules', constants.TEST_RUNNER_NAME);
+				shell.rm("-rf", path.join(tnsModulesDestinationPath, constants.TEST_RUNNER_NAME));
 				if (!this.$options.release && this.$fs.exists(testRunnerSourcePath).wait()) {
 					shell.cp("-Rf", testRunnerSourcePath, tnsModulesDestinationPath);
 				}

lib/services/test-execution-service.ts

@@ -8,10 +8,9 @@ import Future = require('fibers/future');
 import * as os from 'os';
 
 class TestExecutionService implements ITestExecutionService {
-	private static RUNNER_BASE_PATH = './tns_modules/nativescript-unit-test-runner/';
-	private static MAIN_APP_NAME = TestExecutionService.RUNNER_BASE_PATH + 'app.js';
-	private static CONFIG_FILE_NAME = TestExecutionService.RUNNER_BASE_PATH + 'config.js';
-	private static SOCKETIO_JS_FILE_NAME = TestExecutionService.RUNNER_BASE_PATH + 'socket.io.js';
+	private static MAIN_APP_NAME = `./tns_modules/${constants.TEST_RUNNER_NAME}/app.js`;
+	private static CONFIG_FILE_NAME = `node_modules/${constants.TEST_RUNNER_NAME}/config.js`;
+	private static SOCKETIO_JS_FILE_NAME = `node_modules/${constants.TEST_RUNNER_NAME}/socket.io.js`;
 
 	constructor(
 		private $projectData: IProjectData,
@@ -29,21 +28,24 @@ class TestExecutionService implements ITestExecutionService {
 
 	public startTestRunner(platform: string) : IFuture<void> {
 		return (() => {
+			this.$options.justlaunch = true;
+			
 			let platformData = this.$platformsData.getPlatformData(platform);
+			let projectDir = this.$projectData.projectDir;
 
 			let projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 
-			this.$platformService.preparePlatform(platform).wait();
-			this.detourEntryPoint(projectFilesPath).wait();
-
 			let configJs = this.generateConfig(this.$options.port);
-			this.$fs.writeFile(path.join(projectFilesPath, TestExecutionService.CONFIG_FILE_NAME), configJs).wait();
+			this.$fs.writeFile(path.join(projectDir, TestExecutionService.CONFIG_FILE_NAME), configJs).wait();
 
 			let socketIoJsUrl = `http://localhost:${this.$options.port}/socket.io/socket.io.js`;
 			let socketIoJs = this.$httpClient.httpRequest(socketIoJsUrl).wait().body;
-			this.$fs.writeFile(path.join(projectFilesPath, TestExecutionService.SOCKETIO_JS_FILE_NAME), socketIoJs).wait();
+			this.$fs.writeFile(path.join(projectDir, TestExecutionService.SOCKETIO_JS_FILE_NAME), socketIoJs).wait();
+
+			this.$platformService.preparePlatform(platform).wait();
+			this.detourEntryPoint(projectFilesPath).wait();
 
-			let watchGlob = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME);
+			let watchGlob = path.join(projectDir, constants.APP_FOLDER_NAME);
 
 			let platformSpecificLiveSyncServices: IDictionary<any> = {
 				android: (_device: Mobile.IDevice, $injector: IInjector): IPlatformSpecificLiveSyncService => {