test: update tests

Author: rigor789

test/cocoapods-service.ts

@@ -38,6 +38,13 @@ function createTestInjector(): IInjector {
 	testInjector.register("logger", LoggerStub);
 	testInjector.register("config", {});
 	testInjector.register("xcconfigService", XcconfigService);
+	testInjector.register("xcodeSelectService", {
+		getXcodeVersion() {
+			return {
+				major: 14,
+			};
+		},
+	});
 	testInjector.register("projectData", {});
 	testInjector.register("cocoaPodsPlatformManager", CocoaPodsPlatformManager);
 

test/ios-project-service.ts

@@ -110,7 +110,13 @@ function createTestInjector(
 	);
 	testInjector.register("projectData", projectData);
 	testInjector.register("projectHelper", {});
-	testInjector.register("xcodeSelectService", {});
+	testInjector.register("xcodeSelectService", {
+		getXcodeVersion() {
+			return {
+				major: 14,
+			};
+		},
+	});
 	testInjector.register("staticConfig", ConfigLib.StaticConfig);
 	testInjector.register("projectDataService", ProjectDataServiceStub);
 	testInjector.register("prompter", {});
@@ -259,24 +265,24 @@ describe("Cocoapods support", () => {
 	if (require("os").platform() !== "darwin") {
 		console.log("Skipping Cocoapods tests. They cannot work on windows");
 	} else {
-		const expectedArchExclusions = (projectPath: string) =>
-			[
-				``,
-				`post_install do |installer|`,
-				`  post_installNativeScript_CLI_Architecture_Exclusions_0 installer`,
-				`end`,
-				``,
-				`# Begin Podfile - ${projectPath}/platforms/ios/Podfile-exclusions`,
-				`def post_installNativeScript_CLI_Architecture_Exclusions_0 (installer)`,
-				`  installer.pods_project.build_configurations.each do |config|`,
-				`    config.build_settings.delete "VALID_ARCHS"`,
-				`    config.build_settings["EXCLUDED_ARCHS_x86_64"] = "arm64 arm64e"`,
-				`    config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))"`,
-				`    config.build_settings["EXCLUDED_ARCHS[sdk=iphoneos*]"] = "i386 armv6 armv7 armv7s armv8 x86_64"`,
-				`  end`,
-				`end`,
-				`# End Podfile`,
-			].join("\n");
+		// const expectedArchExclusions = (projectPath: string) =>
+		// 	[
+		// 		``,
+		// 		`post_install do |installer|`,
+		// 		`  post_installNativeScript_CLI_Architecture_Exclusions_0 installer`,
+		// 		`end`,
+		// 		``,
+		// 		`# Begin Podfile - ${projectPath}/platforms/ios/Podfile-exclusions`,
+		// 		`def post_installNativeScript_CLI_Architecture_Exclusions_0 (installer)`,
+		// 		`  installer.pods_project.build_configurations.each do |config|`,
+		// 		`    config.build_settings.delete "VALID_ARCHS"`,
+		// 		`    config.build_settings["EXCLUDED_ARCHS_x86_64"] = "arm64 arm64e"`,
+		// 		`    config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "i386 armv6 armv7 armv7s armv8 $(EXCLUDED_ARCHS_$(NATIVE_ARCH_64_BIT))"`,
+		// 		`    config.build_settings["EXCLUDED_ARCHS[sdk=iphoneos*]"] = "i386 armv6 armv7 armv7s armv8 x86_64"`,
+		// 		`  end`,
+		// 		`end`,
+		// 		`# End Podfile`,
+		// 	].join("\n");
 
 		it("adds а base Podfile", async () => {
 			const projectName = "projectDirectory";
@@ -486,7 +492,8 @@ describe("Cocoapods support", () => {
 				`# Begin Podfile - ${pluginPodfilePath}`,
 				expectedPluginPodfileContent,
 				"# End Podfile",
-				expectedArchExclusions(projectPath),
+				// only on xcode 12
+				// expectedArchExclusions(projectPath),
 				"end",
 			].join("\n");
 			assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
@@ -613,7 +620,8 @@ describe("Cocoapods support", () => {
 				`# Begin Podfile - ${pluginPodfilePath}`,
 				expectedPluginPodfileContent,
 				"# End Podfile",
-				expectedArchExclusions(projectPath),
+				// only on XCode 12
+				// expectedArchExclusions(projectPath),
 				"end",
 			].join("\n");
 			assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
@@ -623,18 +631,21 @@ describe("Cocoapods support", () => {
 				projectData
 			);
 
-			const expectedProjectPodfileContentAfter = [
-				"use_frameworks!\n",
-				`target "${projectName}" do`,
-				"",
-				expectedArchExclusions(projectPath),
-				"end",
-			].join("\n");
-			actualProjectPodfileContent = fs.readText(projectPodfilePath);
-			assert.equal(
-				actualProjectPodfileContent,
-				expectedProjectPodfileContentAfter
-			);
+			assert.isFalse(fs.exists(projectPodfilePath));
+
+			// only on xcode12
+			// const expectedProjectPodfileContentAfter = [
+			// 	"use_frameworks!\n",
+			// 	`target "${projectName}" do`,
+			// 	"",
+			//  expectedArchExclusions(projectPath),
+			// 	"end",
+			// ].join("\n");
+			// actualProjectPodfileContent = fs.readText(projectPodfilePath);
+			// assert.equal(
+			// 	actualProjectPodfileContent,
+			// 	expectedProjectPodfileContentAfter
+			// );
 		});
 	}
 });