Fix npm support tests

Fix the tests by modifying current logic:
 - stop using ensurePrepareInfo for setting `nativePlatformStatus` property - introduce new method for setting it. The problem with using `ensurePrepareInfo` is that it saves the prepareInfo and calling checkForChanges after that is incorrect in case we modify the `bundle` option. Check test: `Ensures that tns_modules absent when bundling` - the last case was failing because when we call ensurePrepareInfo last time, bundle is false, we overwrite the prepareInfo in the file and checkForChanges says that bundle is currently false and has been false in the previous case.
 - in case prepareInfo is missing, we should not call addPlatform again - the else in `ensurePlatformInstalled` is not correct in case we execute `tns platform add <platform>` and then try `tns run/build/prepare <platform>` - in this case we do not have prepareInfo, so we try adding platform again. However, due to current implementation, we are sure that when we do not have prepareInfo, we've called platform add from CLI, so the platform is already added correctly.
 - fix a strange if inside `preparePlatformCoreNative` - we must prepare the node_modules in case `--bundle` is passed or the modulesChanged property of `changesInfo` is true.

Author: rosen-vladimirov

lib/definitions/project-changes.d.ts

@@ -31,7 +31,7 @@ interface IProjectChangesService {
 	getPrepareInfo(platform: string, projectData: IProjectData): IPrepareInfo;
 	savePrepareInfo(platform: string, projectData: IProjectData): void;
 	getPrepareInfoFilePath(platform: string, projectData: IProjectData): string;
-	ensurePrepareInfo(platform: string, projectData: IProjectData, projectChangesOptions: IProjectChangesOptions): boolean;
+	setNativePlatformStatus(platform: string, projectData: IProjectData, nativePlatformStatus: IAddedNativePlatform): void;
 	currentChanges: IProjectChangesInfo;
 }
 

lib/services/platform-service.ts

@@ -340,7 +340,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			await platformData.platformProjectService.prepareProject(projectData, platformSpecificData);
 		}
 
-		if (changesInfo && !changesInfo.modulesChanged && appFilesUpdaterOptions.bundle) {
+		if (!changesInfo || changesInfo.modulesChanged || appFilesUpdaterOptions.bundle) {
 			let appDestinationDirectoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 			let lastModifiedTime = this.$fs.exists(appDestinationDirectoryPath) ? this.$fs.getFsStats(appDestinationDirectoryPath).mtime : null;
 
@@ -354,8 +354,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 
 		platformData.platformProjectService.interpolateConfigurationFile(projectData, platformSpecificData);
-		this.$projectChangesService.ensurePrepareInfo(platform, projectData,
-			{ nativePlatformStatus: constants.NativePlatformStatus.alreadyPrepared, release: appFilesUpdaterOptions.release, bundle: appFilesUpdaterOptions.bundle, provision: platformSpecificData.provision });
+		this.$projectChangesService.setNativePlatformStatus(platform, projectData,
+			{ nativePlatformStatus: constants.NativePlatformStatus.alreadyPrepared });
 	}
 
 	private async copyAppFiles(platformData: IPlatformData, appFilesUpdaterOptions: IAppFilesUpdaterOptions, projectData: IProjectData): Promise<void> {
@@ -742,7 +742,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		} else {
 			const shouldAddNativePlatform = !nativePrepare || !nativePrepare.skip;
 			const prepareInfo = this.$projectChangesService.getPrepareInfo(platform, projectData);
-			requiresNativePlatformAdd = !prepareInfo || prepareInfo.nativePlatformStatus === constants.NativePlatformStatus.requiresPlatformAdd;
+			// In case there's no prepare info, it means only platform add had been executed. So we've come from CLI and we do not need to prepare natively.
+			requiresNativePlatformAdd = prepareInfo && prepareInfo.nativePlatformStatus === constants.NativePlatformStatus.requiresPlatformAdd;
 			if (requiresNativePlatformAdd && shouldAddNativePlatform) {
 				await this.addPlatform(platform, platformTemplate, projectData, config, "", nativePrepare);
 			}

lib/services/project-changes-service.ts

@@ -139,6 +139,14 @@ export class ProjectChangesService implements IProjectChangesService {
 		this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
 	}
 
+	public setNativePlatformStatus(platform: string, projectData: IProjectData, addedPlatform: IAddedNativePlatform): void {
+		this._prepareInfo = this._prepareInfo || this.getPrepareInfo(platform, projectData);
+		if (this._prepareInfo) {
+			this._prepareInfo.nativePlatformStatus = addedPlatform.nativePlatformStatus;
+			this.savePrepareInfo(platform, projectData);
+		}
+	}
+
 	public ensurePrepareInfo(platform: string, projectData: IProjectData, projectChangesOptions: IProjectChangesOptions): boolean {
 		this._prepareInfo = this.getPrepareInfo(platform, projectData);
 		if (this._prepareInfo) {
@@ -150,7 +158,6 @@ export class ProjectChangesService implements IProjectChangesService {
 			let prepareInfoFile = path.join(platformData.projectRoot, prepareInfoFileName);
 			this._outputProjectMtime = this.$fs.getFsStats(prepareInfoFile).mtime.getTime();
 			this._outputProjectCTime = this.$fs.getFsStats(prepareInfoFile).ctime.getTime();
-			this.savePrepareInfo(platform, projectData);
 			return false;
 		}
 
@@ -171,8 +178,6 @@ export class ProjectChangesService implements IProjectChangesService {
 		this._changesInfo.appResourcesChanged = true;
 		this._changesInfo.modulesChanged = true;
 		this._changesInfo.configChanged = true;
-
-		this.savePrepareInfo(platform, projectData);
 		return true;
 	}
 

test/stubs.ts

@@ -575,7 +575,7 @@ export class ProjectChangesService implements IProjectChangesService {
 		return <IProjectChangesInfo>{};
 	}
 
-	public ensurePrepareInfo(platform: string, projectData: IProjectData, projectChangesOptions: IProjectChangesOptions): boolean {
+	public setNativePlatformStatus(platform: string, projectData: IProjectData, nativePlatformStatus: IAddedNativePlatform): boolean {
 		return true;
 	}
 }