chore(tests): fix tests related to fetching app_resources from nsconfig

petekanev · petekanev · commit 7dcfa3a92faa · 2018-01-22T15:18:58.000+02:00
diff --git a/lib/project-data.ts b/lib/project-data.ts
@@ -1,6 +1,5 @@
 import * as constants from "./constants";
 import * as path from "path";
-import { cache } from "./common/decorators";
 import { EOL } from "os";
 
 interface IProjectType {
@@ -87,9 +86,8 @@ export class ProjectData implements IProjectData {
 		this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir || this.$options.path || currentDir);
 	}
 
-	@cache()
 	public getAppResourcesDirectoryPath(projectDir?: string): string {
-		if (!!projectDir) {
+		if (!projectDir) {
 			projectDir = this.projectDir;
 		}
 
diff --git a/lib/providers/project-files-provider.ts b/lib/providers/project-files-provider.ts
@@ -6,11 +6,11 @@ import { ProjectFilesProviderBase } from "../common/services/project-files-provi
 export class ProjectFilesProvider extends ProjectFilesProviderBase {
 	constructor(private $platformsData: IPlatformsData,
 		$mobileHelper: Mobile.IMobileHelper,
-		$options:IOptions) {
-			super($mobileHelper, $options);
+		$options: IOptions) {
+		super($mobileHelper, $options);
 	}
 
-	private static INTERNAL_NONPROJECT_FILES = [ "**/*.ts" ];
+	private static INTERNAL_NONPROJECT_FILES = ["**/*.ts"];
 
 	public mapFilePath(filePath: string, platform: string, projectData: IProjectData, projectFilesConfig: IProjectFilesConfig): string {
 		const platformData = this.$platformsData.getPlatformData(platform.toLowerCase(), projectData);
@@ -23,14 +23,14 @@ export class ProjectFilesProvider extends ProjectFilesProviderBase {
 			mappedFilePath = path.join(platformData.appDestinationDirectoryPath, path.relative(projectData.projectDir, parsedFilePath));
 		}
 
-		const appResourcesDirectoryPath = projectData.appDirectoryPath;
+		const appResourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
 		const platformSpecificAppResourcesDirectoryPath = path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName);
 		if (parsedFilePath.indexOf(appResourcesDirectoryPath) > -1 && parsedFilePath.indexOf(platformSpecificAppResourcesDirectoryPath) === -1) {
 			return null;
 		}
 
 		if (parsedFilePath.indexOf(platformSpecificAppResourcesDirectoryPath) > -1) {
-			const appResourcesRelativePath = path.relative(path.join(appResourcesDirectoryPath,
+			const appResourcesRelativePath = path.relative(path.join(projectData.getAppResourcesDirectoryPath(),
 				platformData.normalizedPlatformName), parsedFilePath);
 			mappedFilePath = path.join(platformData.platformProjectService.getAppResourcesDestinationDirectoryPath(projectData), appResourcesRelativePath);
 		}
diff --git a/test/ios-entitlements-service.ts b/test/ios-entitlements-service.ts
@@ -19,6 +19,7 @@ describe("IOSEntitlements Service Tests", () => {
 		const testInjector = new yok.Yok();
 
 		testInjector.register('platformsData', stubs.PlatformsDataStub);
+		testInjector.register('projectData', stubs.ProjectDataStub);
 		testInjector.register("logger", stubs.LoggerStub);
 		testInjector.register('iOSEntitlementsService', IOSEntitlementsService);
 
@@ -46,7 +47,7 @@ describe("IOSEntitlements Service Tests", () => {
 		injector = createTestInjector();
 
 		platformsData = injector.resolve("platformsData");
-		projectData = <IProjectData>platformsData.getPlatformData();
+		projectData = injector.resolve("projectData");
 		projectData.projectName = 'testApp';
 
 		projectData.platformsDir = temp.mkdirSync("platformsDir");
diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
@@ -33,6 +33,7 @@ import { NodePackageManager } from "../lib/node-package-manager";
 import { assert } from "chai";
 import { IOSProvisionService } from "../lib/services/ios-provision-service";
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
+import { ProjectDataStub } from "../test/stubs";
 import temp = require("temp");
 
 temp.track();
@@ -64,12 +65,13 @@ function createTestInjector(projectPath: string, projectName: string): IInjector
 	testInjector.register("iOSEntitlementsService", IOSEntitlementsService);
 	testInjector.register("logger", LoggerLib.Logger);
 	testInjector.register("options", OptionsLib.Options);
-	testInjector.register("projectData", {
+	const projectData = Object.assign({}, ProjectDataStub, {
 		platformsDir: path.join(projectPath, "platforms"),
 		projectName: projectName,
 		projectPath: projectPath,
 		projectFilePath: path.join(projectPath, "package.json")
 	});
+	testInjector.register("projectData", projectData);
 	testInjector.register("projectHelper", {});
 	testInjector.register("xcodeSelectService", {});
 	testInjector.register("staticConfig", ConfigLib.StaticConfig);
diff --git a/test/platform-service.ts b/test/platform-service.ts
@@ -445,7 +445,6 @@ describe('Platform Service Tests', () => {
 			const projectData = testInjector.resolve("projectData");
 			projectData.projectDir = testDirData.tempFolder;
 			projectData.appDirectoryPath = testDirData.appFolderPath;
-			projectData.getAppResourcesDirectoryPath = () => path.join(testDirData.appFolderPath, "App_Resources");
 			projectData.projectName = "app";
 
 			platformService = testInjector.resolve("platformService");
diff --git a/test/project-files-provider.ts b/test/project-files-provider.ts
@@ -1,5 +1,6 @@
 import { Yok } from "../lib/common/yok";
 import { ProjectFilesProvider } from "../lib/providers/project-files-provider";
+import * as stubs from "./stubs";
 import { assert } from "chai";
 import * as path from "path";
 
@@ -14,6 +15,8 @@ function createTestInjector(): IInjector {
 		platformNames: ["Android", "iOS"]
 	});
 
+	testInjector.register('projectData', stubs.ProjectDataStub);
+
 	testInjector.register("platformsData", {
 		getPlatformData: (platform: string) => {
 			return {
@@ -26,10 +29,6 @@ function createTestInjector(): IInjector {
 		},
 	});
 
-	testInjector.register("projectData", {
-		projectDir: projectDir
-	});
-
 	testInjector.register("options", { release: false });
 
 	return testInjector;
@@ -38,9 +37,12 @@ function createTestInjector(): IInjector {
 describe("project-files-provider", () => {
 	let testInjector: IInjector;
 	let projectFilesProvider: IProjectFilesProvider;
+	let projectData: IProjectData;
 
 	beforeEach(() => {
 		testInjector = createTestInjector();
+		projectData = testInjector.resolve("projectData");
+		projectData.projectDir = projectDir;
 		projectFilesProvider = testInjector.resolve(ProjectFilesProvider);
 	});
 
@@ -56,37 +58,31 @@ describe("project-files-provider", () => {
 
 	describe("mapFilePath", () => {
 		it("returns file path from prepared project when path from app dir is passed", () => {
-			const projectData: IProjectData = testInjector.resolve("projectData");
 			const mappedFilePath = projectFilesProvider.mapFilePath(path.join(appSourceDir, "test.js"), "android", projectData, {});
 			assert.deepEqual(mappedFilePath, path.join(appDestinationDirectoryPath, "app", "test.js"));
 		});
 
 		it("returns file path from prepared project when path from app/App_Resources/platform dir is passed", () => {
-			const projectData: IProjectData = testInjector.resolve("projectData");
 			const mappedFilePath = projectFilesProvider.mapFilePath(path.join(appSourceDir, "App_Resources", "android", "test.js"), "android", projectData, {});
 			assert.deepEqual(mappedFilePath, path.join(appResourcesDestinationDirectoryPath, "test.js"));
 		});
 
 		it("returns null when path from app/App_Resources/android dir is passed and iOS platform is specified", () => {
-			const projectData: IProjectData = testInjector.resolve("projectData");
 			const mappedFilePath = projectFilesProvider.mapFilePath(path.join(appSourceDir, "App_Resources", "android", "test.js"), "iOS", projectData, {});
 			assert.deepEqual(mappedFilePath, null);
 		});
 
 		it("returns null when path from app/App_Resources/ dir (not platform specific) is passed", () => {
-			const projectData: IProjectData = testInjector.resolve("projectData");
 			const mappedFilePath = projectFilesProvider.mapFilePath(path.join(appSourceDir, "App_Resources", "test.js"), "android", projectData, {});
 			assert.deepEqual(mappedFilePath, null);
 		});
 
 		it("returns file path from prepared project when path from app dir is passed and it contains platform in its name", () => {
-			const projectData: IProjectData = testInjector.resolve("projectData");
 			const mappedFilePath = projectFilesProvider.mapFilePath(path.join(appSourceDir, "test.android.js"), "android", projectData, {});
 			assert.deepEqual(mappedFilePath, path.join(appDestinationDirectoryPath, "app", "test.js"));
 		});
 
 		it("returns file path from prepared project when path from app dir is passed and it contains configuration in its name", () => {
-			const projectData: IProjectData = testInjector.resolve("projectData");
 			const mappedFilePath = projectFilesProvider.mapFilePath(path.join(appSourceDir, "test.debug.js"), "android", projectData, {});
 			assert.deepEqual(mappedFilePath, path.join(appDestinationDirectoryPath, "app", "test.js"));
 		});
diff --git a/test/project-service.ts b/test/project-service.ts
@@ -133,7 +133,7 @@ class ProjectIntegrationTest {
 		this.testInjector.register("projectHelper", ProjectHelperLib.ProjectHelper);
 		this.testInjector.register("projectTemplatesService", ProjectTemplatesService);
 		this.testInjector.register("projectNameValidator", mockProjectNameValidator);
-		this.testInjector.register("projectData", {});
+		this.testInjector.register("projectData", stubs.ProjectDataStub);
 
 		this.testInjector.register("fs", FileSystem);
 		this.testInjector.register("projectDataService", ProjectDataServiceLib.ProjectDataService);
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -4,6 +4,10 @@ import * as util from "util";
 import * as chai from "chai";
 import { EventEmitter } from "events";
 
+import * as fs from "fs";
+import * as path from "path";
+import * as constants from "./../lib/constants";
+
 export class LoggerStub implements ILogger {
 	setLevel(level: string): void { }
 	getLevel(): string { return undefined; }
@@ -244,17 +248,36 @@ export class ProjectDataStub implements IProjectData {
 	get platformsDir(): string {
 		return "";
 	}
+	set platformsDir(value) {
+	}
 	projectFilePath: string;
 	projectId: string;
 	dependencies: any;
 	appDirectoryPath: string;
 	devDependencies: IStringDictionary;
 	projectType: string;
-	initializeProjectData(projectDir?: string): void {
+	public initializeProjectData(projectDir?: string): void {
 		this.projectDir = this.projectDir || projectDir;
 	}
-	getAppResourcesDirectoryPath(projectDir?: string): string {
-		return this.projectDir + "/App_Resources";
+	public getAppResourcesDirectoryPath(projectDir?: string): string {
+		if (!projectDir) {
+			projectDir = this.projectDir;
+		}
+
+		const configNSFilePath = path.join(projectDir, constants.CONFIG_NS_FILE_NAME);
+		let absoluteAppResourcesDirPath: string;
+
+		if (fs.existsSync(configNSFilePath)) {
+			const configNS = JSON.parse(fs.readFileSync(configNSFilePath).toString());
+
+			if (configNS && configNS[constants.CONFIG_NS_APP_RESOURCES_ENTRY]) {
+				const appResourcesDirPath = configNS[constants.CONFIG_NS_APP_RESOURCES_ENTRY];
+
+				absoluteAppResourcesDirPath = path.resolve(projectDir, appResourcesDirPath);
+			}
+		}
+
+		return absoluteAppResourcesDirPath || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import * as constants from "./constants";`
`2`	`2`	`import * as path from "path";`
`3`		`-import { cache } from "./common/decorators";`
`4`	`3`	`import { EOL } from "os";`
`5`	`4`
`6`	`5`	`interface IProjectType {`
`@@ -87,9 +86,8 @@ export class ProjectData implements IProjectData {`
`87`	`86`	`this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir \|\| this.$options.path \|\| currentDir);`
`88`	`87`	`}`
`89`	`88`
`90`		`- @cache()`
`91`	`89`	`public getAppResourcesDirectoryPath(projectDir?: string): string {`
`92`		`- if (!!projectDir) {`
	`90`	`+ if (!projectDir) {`
`93`	`91`	`projectDir = this.projectDir;`
`94`	`92`	`}`
`95`	`93`