feat: make tests green with Xcode10 (#150)

Author: dtopuzov

core/tns/tns.py

@@ -486,7 +486,8 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
             attr = {"--provision": PROVISIONING}
             attributes.update(attr)
 
-        output = Tns.run_tns_command("build ios", attributes=attributes, tns_path=tns_path, log_trace=log_trace, measureTime=measureTime)
+        output = Tns.run_tns_command("build ios", attributes=attributes, tns_path=tns_path, log_trace=log_trace,
+                                     measureTime=measureTime)
 
         app_name = Tns.__get_app_name_from_attributes(attributes=attributes)
         app_name = app_name.replace("\"", "")  # Handle projects with space
@@ -505,9 +506,15 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
 
             # Verify release/debug builds
             if "--release" in attributes.keys():
-                assert "CONFIGURATION Release" in output
+                if Xcode.get_version() < 10:
+                    assert "CONFIGURATION Release" in output
+                else:
+                    assert '"-configuration" "Release"' in output
             else:
-                assert "CONFIGURATION Debug" in output
+                if Xcode.get_version() < 10:
+                    assert "CONFIGURATION Debug" in output
+                else:
+                    assert '"-configuration" "Debug"' in output
 
             # Verify simulator/device builds
             device_folder = app_name + "/platforms/ios/build/device/"
@@ -531,7 +538,7 @@ def build_ios(attributes={}, assert_success=True, tns_path=None, log_trace=False
                     assert "build/emulator/" + app_id + ".app" in output
                 else:
                     # Xcode 8.* output contains some warnings for images, so we will assert only on Xcode 9.*
-                    if "9." in Xcode.get_version():
+                    if Xcode.get_version() >= 9:
                         assert "CompileStoryboard" not in output, "Native build out is displayed!"
                         assert "CompileAssetCatalog" not in output, "Native build out is displayed!"
                         assert "ProcessInfoPlistFile" not in output, "Native build out is displayed!"

core/xcode/xcode.py

@@ -20,5 +20,5 @@ def get_version():
         Get Xcode version
         :return: Version as string.
         """
-        output = run(command="xcodebuild -version | grep Xcode", log_level=CommandLogLevel.SILENT)
-        return output.replace("Xcode ", "")
+        output = run(command="xcodebuild -version | head -n 1 | sed -e 's/Xcode //'", log_level=CommandLogLevel.SILENT)
+        return int(output.split('.')[0])

runNose.py

@@ -81,7 +81,7 @@ def get_repos():
         get_test_packages(platform=Platform.BOTH)
         Simulator.reset()
 
-        if "8." in Xcode.get_version():
+        if Xcode.get_version() < 9:
             SIMULATOR_SDK = '10.0'
 
         Simulator.create(SIMULATOR_NAME, SIMULATOR_TYPE, SIMULATOR_SDK)

tests/build/ios/build_ios_tests.py

@@ -21,7 +21,7 @@
 class BuildiOSTests(BaseClass):
     app_name_dash = "test-app"
     app_name_space = "Test App"
-    app_name_noplatform = "Test_AppNoPlatform"
+    app_name_no_platform = "Test_AppNoPlatform"
     app_name_ios = "testapp_ios"
 
     @classmethod
@@ -35,15 +35,14 @@ def setUpClass(cls):
 
         Xcode.cleanup_cache()
 
-
     def setUp(self):
         BaseClass.setUp(self)
         Simulator.stop()
         Folder.cleanup(self.app_name_dash)
         Folder.cleanup(self.app_name_space)
         Folder.cleanup(self.app_name_ios)
-        Folder.cleanup(self.app_name_noplatform)
-        Folder.cleanup(self.app_name_noplatform + '/platforms/ios/build')
+        Folder.cleanup(self.app_name_no_platform)
+        Folder.cleanup(self.app_name_no_platform + '/platforms/ios/build')
 
         Tns.platform_remove(platform=Platform.IOS, attributes={"--path": self.app_name}, assert_success=False)
 
@@ -57,7 +56,7 @@ def tearDownClass(cls):
         File.remove("TestApp.ipa")
 
         Folder.cleanup(cls.app_name)
-        Folder.cleanup(cls.app_name_noplatform)
+        Folder.cleanup(cls.app_name_no_platform)
         Folder.cleanup(cls.app_name_dash)
         Folder.cleanup(cls.app_name_space)
 
@@ -114,8 +113,8 @@ def test_200_build_ios_inside_project(self):
         assert File.exists(self.app_name + "/platforms/ios/build/emulator/TestApp.app")
 
     def test_210_build_ios_platform_not_added_or_platforms_deleted(self):
-        Tns.create_app(self.app_name_noplatform)
-        Tns.build_ios(attributes={"--path": self.app_name_noplatform})
+        Tns.create_app(self.app_name_no_platform)
+        Tns.build_ios(attributes={"--path": self.app_name_no_platform})
 
     def test_300_build_ios_with_dash(self):
         Tns.create_app(self.app_name_dash)
@@ -185,8 +184,8 @@ def test_320_build_ios_with_custom_entitlements(self):
         assert "doesn't include the aps-environment and inter-app-audio entitlements" in output
 
     def test_400_build_ios_with_wrong_param(self):
-        Tns.create_app(self.app_name_noplatform)
-        output = Tns.build_ios(attributes={"--path": self.app_name_noplatform, "--" + invalid: ""},
+        Tns.create_app(self.app_name_no_platform)
+        output = Tns.build_ios(attributes={"--path": self.app_name_no_platform, "--" + invalid: ""},
                                assert_success=False)
         assert invalid_option.format(invalid) in output
         assert error not in output.lower()