Fix plugin remove, mock interpolateConfigurationFile and address some PR comments

Author: Fatme Havaluova

lib/services/ios-project-service.ts

@@ -124,8 +124,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			let infoPlistFilePath = path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, util.format("%s-%s", IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, "Info.plist"));
 			this.interpolateConfigurationFile(infoPlistFilePath).wait();
 
-			this.replaceFileName("-Info.plist", path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
-			this.replaceFileName("-Prefix.pch", path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
+			let projectRootFilePath = path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
+			this.replaceFileName("-Info.plist", projectRootFilePath).wait();
+			this.replaceFileName("-Prefix.pch", projectRootFilePath).wait();
 			this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, this.platformData.projectRoot).wait();
 
 			let pbxprojFilePath = path.join(this.platformData.projectRoot, this.$projectData.projectName + IOSProjectService.XCODE_PROJECT_EXT_NAME, "project.pbxproj");

lib/services/plugins-service.ts

@@ -75,7 +75,7 @@ export class PluginsService implements IPluginsService {
 					// Remove the plugin and call merge for another plugins that have configuration file
 					let pluginConfigurationFilePath = this.getPluginConfigurationFilePath(pluginData, platformData);
 					if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
-						this.merge(pluginData, platformData).wait();
+						this.merge(pluginData, platformData, (data: IPluginData) => data.name !== pluginData.name).wait();
 					}
 
 					if(pluginData.pluginVariables) {
@@ -340,12 +340,13 @@ export class PluginsService implements IPluginsService {
 		}).future<void>()();
 	}
 
-	private merge(pluginData: IPluginData, platformData: IPlatformData): IFuture<void> {
+	private merge(pluginData: IPluginData, platformData: IPlatformData, mergeCondition?: (_pluginData: IPluginData) => boolean): IFuture<void> {
 		return (() => {
 			let tnsModulesDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, constants.TNS_MODULES_FOLDER_NAME);
 			let nodeModules = this.$broccoliBuilder.getChangedNodeModules(tnsModulesDestinationPath, platformData.normalizedPlatformName.toLowerCase()).wait();
 
-			_(_.keys(nodeModules))
+			_(nodeModules)
+				.keys()
 				.map(nodeModule => this.getNodeModuleData(path.join(nodeModule, "package.json")).wait())
 				.map(nodeModuleData => this.convertToPluginData(nodeModuleData))
 				.filter(data => data.isPlugin && this.$fs.exists(this.getPluginConfigurationFilePath(data, platformData)).wait())
@@ -354,7 +355,9 @@ export class PluginsService implements IPluginsService {
 						this.initializeConfigurationFileFromCache(platformData).wait();
 					}
 
-					this.mergeCore(data, platformData).wait();
+					if(!mergeCondition || (mergeCondition && mergeCondition(data))) {
+						this.mergeCore(data, platformData).wait();
+					}
 				})
 				.value();
 

test/plugins-service.ts

@@ -562,35 +562,41 @@ describe("Plugins service", () => {
 			let appDestinationDirectoryPath = path.join(projectFolder, "platforms", "android");
 			fs.ensureDirectoryExists(path.join(appDestinationDirectoryPath, "app")).wait();
 
+			// Mock projectData
+			let projectData = testInjector.resolve("projectData");
+			projectData.projectId = "com.example.android.basiccontactables";
+
+			let configurationFilePath = path.join(appDestinationDirectoryPath, "src", "main", "AndroidManifest.xml");
+
+			let shelljs = require("shelljs");
+
 			// Mock platformsData
 			let platformsData = testInjector.resolve("platformsData");
 			platformsData.getPlatformData = (platform: string) => {
-				let androidProjectService = testInjector.resolve("androidProjectService");
-
 				return {
 					appDestinationDirectoryPath: appDestinationDirectoryPath,
 					frameworkPackageName: "tns-android",
 					configurationFileName: "AndroidManifest.xml",
-					configurationFilePath: path.join(appDestinationDirectoryPath, "src", "main", "AndroidManifest.xml"),
+					configurationFilePath: configurationFilePath,
 					relativeToFrameworkConfigurationFilePath: path.join("src", "main", "AndroidManifest.xml"),
 					mergeXmlConfig: [{ "nodename": "manifest", "attrname": "*" }],
 					platformProjectService:  {
 						preparePluginNativeCode: (pluginData: IPluginData) => future.fromResult(),
-						interpolateConfigurationFile: () => androidProjectService.interpolateConfigurationFile()
+						interpolateConfigurationFile: () => {
+							return (() => {
+								shelljs.sed('-i', /__PACKAGE__/, projectData.projectId, configurationFilePath);
+								shelljs.sed('-i', /__APILEVEL__/, "23", configurationFilePath);
+							}).future<void>()()
+						}
 					},
 					normalizedPlatformName: "Android"
 				};
 			};
 
-			// Mock projectData
-			let projectData = testInjector.resolve("projectData");
-			projectData.projectId = "com.example.android.basiccontactables";
-
 			// Ensure the pluginDestinationPath folder exists
 			let pluginPlatformsDirPath = path.join(projectFolder, "node_modules", pluginName, "platforms", "android");
 			fs.ensureDirectoryExists(pluginPlatformsDirPath).wait();
 
-			let shelljs = require("shelljs");
 			shelljs.cp("-R", path.join(pluginFolderPath, "*"), path.join(projectFolder, "node_modules", pluginName));
 
 			// Creates valid plugin's AndroidManifest.xml file