Add tests for NativeScript/nativescript-cli#3069

Author: dtopuzov

core/settings/strings.py

@@ -53,8 +53,6 @@
 deployed_on_device = "Successfully deployed on device"
 installed_plugin = "Successfully installed plugin {0}"
 tns_plugin = "tns-plugin"
-codesign = "CodeSign"
-nativescript_theme_core = "nativescript-theme-core"
 devDependencies = "devDependencies"
 started_on_device = "Successfully started on device with identifier"
 

core/tns/tns.py

@@ -2,6 +2,7 @@
 A wrapper of tns commands.
 """
 import os
+
 import time
 
 from core.npm.npm import Npm
@@ -10,9 +11,8 @@
 from core.osutils.folder import Folder
 from core.osutils.os_type import OSType
 from core.osutils.process import Process
-from core.settings.settings import TNS_PATH, SUT_FOLDER, DEVELOPMENT_TEAM, TEST_RUN_HOME, \
-    COMMAND_TIMEOUT, CURRENT_OS, TAG
-from core.settings.strings import codesign
+from core.settings.settings import COMMAND_TIMEOUT, TNS_PATH, TAG, TEST_RUN_HOME, DEVELOPMENT_TEAM, CURRENT_OS, \
+    SUT_FOLDER
 from core.tns.tns_platform_type import Platform
 from core.tns.tns_verifications import TnsAsserts
 from core.xcode.xcode import Xcode
@@ -231,10 +231,7 @@ def platform_add(platform=Platform.NONE, version=None, attributes={}, assert_suc
         output = Tns.run_tns_command("platform add " + platform_string, attributes=attributes, log_trace=log_trace,
                                      tns_path=tns_path)
 
-        #######################################################################################
-        # Verify platforms added (if assert_success=True)
-        #######################################################################################
-
+        # Verify platforms added
         app_name = Tns.__get_app_name_from_attributes(attributes)
         if assert_success:
             TnsAsserts.platform_added(app_name=app_name, platform=platform, output=output)
@@ -331,6 +328,14 @@ def prepare_ios(attributes={}, assert_success=True, log_trace=False, tns_path=No
         output = Tns.run_tns_command("prepare ios ", attributes=attributes, log_trace=log_trace, tns_path=tns_path)
         if assert_success:
             assert "Project successfully prepared" in output
+
+        # Verify TEAM_ID
+        if "--for-device" in attributes.keys() or "--forDevice" in attributes.keys():
+            app_name = Tns.__get_app_name_from_attributes(attributes=attributes)
+            app_id = Tns.__get_final_package_name(app_name, platform=Platform.IOS)
+            output = File.read(app_name + '/platforms/ios/' + app_id + 'TestApp' + '.xcodeproj/project.pbxproj')
+            assert DEVELOPMENT_TEAM in output, "TeamID not passed to Xcode project!"
+
         return output
 
     @staticmethod
@@ -370,15 +375,17 @@ def build_ios(attributes={}, assert_success=True, tns_path=None):
             attr = {"--teamId": DEVELOPMENT_TEAM}
             attributes.update(attr)
         output = Tns.run_tns_command("build ios", attributes=attributes, tns_path=tns_path)
+
+        app_name = Tns.__get_app_name_from_attributes(attributes=attributes)
+        app_name = app_name.replace("\"", "")  # Handle projects with space
+        app_id = Tns.__get_final_package_name(app_name, platform=Platform.IOS)
+
         if assert_success:
             assert "BUILD SUCCEEDED" in output
             assert "Project successfully built" in output
             assert "ERROR" not in output
             assert "malformed" not in output
-            assert codesign in output
-            app_name = Tns.__get_app_name_from_attributes(attributes=attributes)
-            app_id = Tns.__get_final_package_name(app_name, platform=Platform.IOS)
-            app_name = app_name.replace("\"", "")  # Handle projects with space
+            assert "CodeSign" in output
 
             # Verify release/debug builds
             if "--release" in attributes.keys():
@@ -399,6 +406,9 @@ def build_ios(attributes={}, assert_success=True, tns_path=None):
                 assert "EXPORT SUCCEEDED" in output
                 assert File.exists(device_folder + app_id + ".ipa"), "IPA file not found!"
                 bundle_content = File.read(device_folder + app_id + ".app/" + app_id)
+
+                output = File.read(app_name + '/platforms/ios/' + app_id + '.xcodeproj/project.pbxproj')
+                assert DEVELOPMENT_TEAM in output, "TeamID not passed to Xcode project!"
             else:
                 assert "build/emulator/" + app_id + ".app" in output
                 assert File.exists(app_name + "/platforms/ios/" + app_id + "/" + app_id + "-Prefix.pch")

tests/build/ios/build_ios_ng_tests.py

@@ -1,23 +1,20 @@
 import os
 
 from core.base_class.BaseClass import BaseClass
-from core.osutils.file import File
 from core.osutils.folder import Folder
 from core.settings.settings import IOS_RUNTIME_PATH
 from core.tns.tns import Tns
 from core.xcode.xcode import Xcode
-from core.settings.strings import *
 
 
 class BuildiOSNGTests(BaseClass):
     @classmethod
     def setUpClass(cls):
         logfile = os.path.join("out", cls.__name__ + ".txt")
         BaseClass.setUpClass(logfile)
-
         Xcode.cleanup_cache()
 
-        Tns.create_app_ng(app_name=cls.app_name)
+        Tns.create_app_ng(app_name=cls.app_name, update_modules=True)
         Tns.platform_add_ios(attributes={"--path": cls.app_name, "--frameworkPath": IOS_RUNTIME_PATH})
 
     @classmethod
@@ -26,15 +23,7 @@ def tearDownClass(cls):
         Folder.cleanup(cls.app_name)
 
     def test_100_build_ios_ng_project(self):
-        output = Tns.build_ios(attributes={"--path": self.app_name})
-        assert "build/emulator/TestApp.app" in output
-        assert File.exists(self.app_name + "/platforms/ios/build/emulator/TestApp.app")
+        Tns.build_ios(attributes={"--path": self.app_name})
 
     def test_200_build_ios_ng_project_release_fordevice(self):
-        output = Tns.build_ios(attributes={"--path": self.app_name,
-                                           "--for-device": "",
-                                           "--release": ""})
-        assert config_release in output
-        assert codesign in output
-        assert "build/device/TestApp.app" in output
-        assert File.exists(self.app_name + "/platforms/ios/build/device/TestApp.ipa")
+        Tns.build_ios(attributes={"--path": self.app_name, "--for-device": "", "--release": ""})