Fix checkEnvironmentRequirements tests and rename IValidateOutput to IValidatePlatformOutput

Author: Fatme

lib/definitions/livesync.d.ts

@@ -543,7 +543,7 @@ interface ILiveSyncCommandHelper {
 	 * @param {string} platform The platform to be validated.
 	 * @return {Promise<void>}
 	 */
-	validatePlatform(platform: string): Promise<IDictionary<IValidateOutput>>;
+	validatePlatform(platform: string): Promise<IDictionary<IValidatePlatformOutput>>;
 
 	/**
 	 * Executes livesync operation. Meant to be called from within a command.

lib/definitions/project.d.ts

@@ -319,7 +319,7 @@ interface ICleanNativeAppData extends IProjectDir, IPlatform { }
 
 interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectServiceBase {
 	getPlatformData(projectData: IProjectData): IPlatformData;
-	validate(projectData: IProjectData): Promise<IValidateOutput>;
+	validate(projectData: IProjectData): Promise<IValidatePlatformOutput>;
 	createProject(frameworkDir: string, frameworkVersion: string, projectData: IProjectData, config: ICreateProjectOptions): Promise<void>;
 	interpolateData(projectData: IProjectData, platformSpecificData: IPlatformSpecificData): Promise<void>;
 	interpolateConfigurationFile(projectData: IProjectData, platformSpecificData: IPlatformSpecificData): void;
@@ -438,7 +438,7 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
 	checkIfPluginsNeedBuild(projectData: IProjectData): Promise<Array<any>>;
 }
 
-interface IValidateOutput {
+interface IValidatePlatformOutput {
 	checkEnvironmentRequirementsOutput: ICheckEnvironmentRequirementsOutput;
 }
 

lib/helpers/livesync-command-helper.ts

@@ -127,8 +127,8 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		await this.$liveSyncService.liveSync(deviceDescriptors, liveSyncInfo);
 	}
 
-	public async validatePlatform(platform: string): Promise<IDictionary<IValidateOutput>> {
-		const result: IDictionary<IValidateOutput> = {};
+	public async validatePlatform(platform: string): Promise<IDictionary<IValidatePlatformOutput>> {
+		const result: IDictionary<IValidatePlatformOutput> = {};
 
 		const availablePlatforms = this.getPlatformsForOperation(platform);
 		for (const availablePlatform of availablePlatforms) {

lib/services/android-project-service.ts

@@ -118,7 +118,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 	}
 
-	public async validate(projectData: IProjectData): Promise<IValidateOutput> {
+	public async validate(projectData: IProjectData): Promise<IValidatePlatformOutput> {
 		this.validatePackageName(projectData.projectId);
 		this.validateProjectName(projectData.projectName);
 

lib/services/ios-project-service.ts

@@ -133,7 +133,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		return path.join(this.getPlatformData(projectData).projectRoot, projectData.projectName, "Resources");
 	}
 
-	public async validate(projectData: IProjectData): Promise<IValidateOutput> {
+	public async validate(projectData: IProjectData): Promise<IValidatePlatformOutput> {
 		if (!this.$hostInfo.isDarwin) {
 			return;
 		}

package.json

@@ -59,7 +59,7 @@
     "ora": "2.0.0",
     "osenv": "0.1.3",
     "pacote": "8.1.6",
-    "pako": "^1.0.6",
+    "pako": "1.0.6",
     "pbxproj-dom": "1.0.11",
     "plist": "1.1.0",
     "plist-merge-patch": "0.1.1",

test/services/platform-environment-requirements.ts

@@ -84,7 +84,7 @@ describe("platformEnvironmentRequirements ", () => {
 		it("should return true when environment is configured", async () => {
 			mockDoctorService({ canExecuteLocalBuild: true });
 			const result = await platformEnvironmentRequirements.checkEnvironmentRequirements(platform);
-			assert.isTrue(result);
+			assert.isTrue(result.canExecute);
 			assert.isTrue(promptForChoiceData.length === 0);
 		});
 		it("should show prompt when environment is not configured and nativescript-cloud extension is not installed", async () => {
@@ -108,10 +108,12 @@ describe("platformEnvironmentRequirements ", () => {
 			assert.deepEqual("To continue, choose one of the following options: ", promptForChoiceData[0].message);
 			assert.deepEqual(['Sync to Playground', 'Try Cloud Operation', 'Configure for Local Builds', 'Skip Step and Configure Manually'], promptForChoiceData[0].choices);
 		});
-		it("should skip env chech when NS_SKIP_ENV_CHECK environment variable is passed", async() => {
+		it("should skip env check when NS_SKIP_ENV_CHECK environment variable is passed", async() => {
 			process.env.NS_SKIP_ENV_CHECK = true;
 
-			assert.isTrue(await platformEnvironmentRequirements.checkEnvironmentRequirements(platform));
+			const output = await platformEnvironmentRequirements.checkEnvironmentRequirements(platform);
+
+			assert.isTrue(output.canExecute);
 			assert.isFalse(isExtensionInstallCalled);
 			assert.isTrue(promptForChoiceData.length === 0);
 		});
@@ -128,7 +130,8 @@ describe("platformEnvironmentRequirements ", () => {
 
 				mockNativeScriptCloudExtensionService({ isInstalled: null });
 
-				assert.isTrue(await platformEnvironmentRequirements.checkEnvironmentRequirements(platform));
+				const output = await platformEnvironmentRequirements.checkEnvironmentRequirements(platform);
+				assert.isTrue(output.canExecute);
 			});
 
 			describe("and env is not configured after executing setup script", () => {

test/stubs.ts

@@ -331,8 +331,8 @@ export class PlatformProjectServiceStub extends EventEmitter implements IPlatfor
 	validateOptions(): Promise<boolean> {
 		return Promise.resolve(true);
 	}
-	validate(): Promise<IValidateOutput> {
-		return Promise.resolve(<IValidateOutput>{});
+	validate(): Promise<IValidatePlatformOutput> {
+		return Promise.resolve(<IValidatePlatformOutput>{});
 	}
 	validatePlugins(projectData: IProjectData) {
 		return Promise.resolve();