fix: failing tests + config service stub

Author: rigor789

lib/controllers/prepare-controller.ts

@@ -58,7 +58,7 @@ export class PrepareController extends EventEmitter {
 		const platformLowerCase = platform.toLowerCase();
 
 		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher) {
-			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher.close();
+			await this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher.close();
 			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher = null;
 		}
 
@@ -73,7 +73,7 @@ export class PrepareController extends EventEmitter {
 	@hook("prepare")
 	private async prepareCore(prepareData: IPrepareData, projectData: IProjectData): Promise<IPrepareResultData> {
 		await this.$platformController.addPlatformIfNeeded(prepareData);
-    
+
 		this.$logger.info("Preparing project...");
 		let result = null;
 

lib/definitions/project.d.ts

@@ -77,58 +77,58 @@ interface IProjectService {
 }
 
 interface INsConfigPlaform {
-  id?: string;
+	id?: string;
 }
 
 interface INsConfigIOS extends INsConfigPlaform {
-  discardUncaughtJsExceptions?: boolean;
+	discardUncaughtJsExceptions?: boolean;
 }
 
 interface INsConfigAndroid extends INsConfigPlaform {
-  v8Flags?: string;
+	v8Flags?: string;
 
-  codeCache?: boolean;
+	codeCache?: boolean;
 
-  heapSnapshotScript?: string;
+	heapSnapshotScript?: string;
 
-  "snapshot.blob"?: string;
+	"snapshot.blob"?: string;
 
-  profilerOutputDir?: string;
+	profilerOutputDir?: string;
 
-  gcThrottleTime?: number;
+	gcThrottleTime?: number;
 
-  profiling?: string;
+	profiling?: string;
 
-  markingMode?: string;
+	markingMode?: string;
 
-  handleTimeZoneChanges?: boolean;
+	handleTimeZoneChanges?: boolean;
 
-  maxLogcatObjectSize?: number;
+	maxLogcatObjectSize?: number;
 
-  forceLog?: boolean;
+	forceLog?: boolean;
 
-  memoryCheckInterval?: number;
+	memoryCheckInterval?: number;
 
-  freeMemoryRatio?: number;
+	freeMemoryRatio?: number;
 
-  suppressCallJSMethodExceptions?: boolean;
+	suppressCallJSMethodExceptions?: boolean;
 
-  discardUncaughtJsExceptions?: boolean;
+	discardUncaughtJsExceptions?: boolean;
 
-  enableLineBreakpoints?: boolean;
+	enableLineBreakpoints?: boolean;
 }
 
 interface INsConfig {
-  id?: string;
-  main?: string;
+	id?: string;
+	main?: string;
 	appPath?: string;
 	appResourcesPath?: string;
 	shared?: boolean;
 	previewAppSchema?: string;
 	overridePods?: string;
-  webpackConfigPath?: string;
-  ios?: INsConfigIOS;
-  android?: INsConfigAndroid;
+	webpackConfigPath?: string;
+	ios?: INsConfigIOS;
+	android?: INsConfigAndroid;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -140,8 +140,8 @@ interface IProjectData extends ICreateProjectData {
 	devDependencies: IStringDictionary;
 	appDirectoryPath: string;
 	appResourcesDirectoryPath: string;
-  projectType: string;
-  packageJsonData: any;
+	projectType: string;
+	packageJsonData: any;
 	nsConfig: INsConfig;
 	androidManifestPath: string;
 	appGradlePath: string;

lib/services/log-source-map-service.ts

@@ -53,20 +53,19 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 			if (!this.$fs.getFsStats(filePath).isDirectory()) {
 				const source = this.$fs.readText(filePath);
 				const sourceMapRaw = sourceMapConverter.fromSource(source);
-        let smc: any = null;
+				let smc: any = null;
 				if (sourceMapRaw && sourceMapRaw.sourcemap) {
 					const sourceMap = sourceMapRaw.sourcemap;
 					smc = await sourcemap.SourceMapConsumer.with(sourceMap, null, (c) => {
-            return c;
-          });
-        }
+						return c;
+					});
+				}
 
 				this.cache[filePath] = smc;
 			}
 		} catch (err) {
 			this.$logger.trace(`Unable to set sourceMapConsumer for file ${filePath}. Error is: ${err}`);
 		}
-
 	}
 
 	public replaceWithOriginalFileLocations(platform: string, messageData: string, loggingOptions: Mobile.IDeviceLogOptions): string {

npm-shrinkwrap.json

@@ -2,12 +2,11 @@ import { assert } from "chai";
 import * as _ from 'lodash';
 import { PrepareController } from "../../lib/controllers/prepare-controller";
 import { MobileHelper } from "../../lib/common/mobile/mobile-helper";
-import { InjectorStub, TempServiceStub, FileSystemStub, ProjectDataStub } from "../stubs";
+import { InjectorStub, TempServiceStub } from "../stubs";
 import { PREPARE_READY_EVENT_NAME } from "../../lib/constants";
 import { IInjector } from "../../lib/common/definitions/yok";
-import { ProjectConfigService } from "../../lib/services/project-config-service";
 
-const projectDir = "/path/to/my/projecDir";
+const projectDir = "/path/to/my/projectDir";
 const prepareData = {
 	projectDir,
 	release: false,
@@ -48,14 +47,8 @@ function createTestInjector(data: { hasNativeChanges: boolean }): IInjector {
 		}
 	}));
 
-  injector.register("mobileHelper", MobileHelper);
-  injector.register("fs", FileSystemStub);
-  const projectData = new ProjectDataStub();
-  projectData.projectName = 'test'
-  injector.register("projectData", projectData);
-
-  injector.register("prepareController", PrepareController);
-  injector.register("projectConfigService", ProjectConfigService)
+	injector.register("mobileHelper", MobileHelper);
+	injector.register("prepareController", PrepareController);
 
 	injector.register("nodeModulesDependenciesBuilder", {
 		getProductionDependencies: () => (<any>[])

test/controllers/prepare-controller.ts

@@ -26,7 +26,7 @@ function createTestInjector(): IInjector {
 				projectDir: "projectDir"
 			};
 		},
-		getNSValue: (projectDir: string, propertyName: string): any => {
+		getRuntimePackage: (projectDir: string, platform: any): any => {
 			return {
 				version: runtimeVersion
 			};