Fix TKLiveSync check and add test for NativeScript/nativescript-cli#2764

Author: dtopuzov

core/tns/tns.py

@@ -357,20 +357,16 @@ def build_ios(attributes={}, assert_success=True, tns_path=None):
             if "--forDevice" in attributes.keys() or "--for-device" in attributes.keys():
                 assert "build/device/" + app_id + ".app" in output
                 assert File.exists(device_folder + app_id + ".ipa")
-                output = File.read(device_folder + app_id + ".app/" + app_id)
-                if "--release" in attributes.keys():
-                    assert "TKLiveSync" not in output, "TKLiveSync binaries available in release configuration."
-                else:
-                    assert "TKLiveSync" in output, "TKLiveSync binaries not available in debug configuration."
+                bundle_content = File.read(device_folder + app_id + ".app/" + app_id)
             else:
                 assert "build/emulator/" + app_id + ".app" in output
                 assert File.exists(app_name + "/platforms/ios/" + app_id + "/" + app_id + "-Prefix.pch")
                 assert File.exists(emu_folder + app_id + ".app")
-                output = File.read(emu_folder + app_id + ".app/" + app_id)
-                if "--release" in attributes.keys():
-                    assert "TKLiveSync" not in output, "TKLiveSync binaries available in release configuration."
-                else:
-                    assert "TKLiveSync" in output, "TKLiveSync binaries not available in debug configuration."
+                bundle_content = File.read(emu_folder + app_id + ".app/" + app_id)
+            if "--release" in attributes.keys():
+                assert "TKLiveSync" not in bundle_content, "TKLiveSync binaries available in release configuration."
+            else:
+                assert "TKLiveSync" in bundle_content, "TKLiveSync binaries not available in debug configuration."
         return output
 
     @staticmethod

tests/build/common/logtrace_tests.py

@@ -1,12 +1,12 @@
 """
 Tests for --log trace option.
 """
-import os
 
-from core.tns.tns import Tns
 from core.base_class.BaseClass import BaseClass
 from core.osutils.folder import Folder
 from core.settings.settings import CURRENT_OS, OSType
+from core.tns.tns import Tns
+
 
 class LogtraceTests(BaseClass):
     def setUp(self):

tests/simulator/run_ios_tests.py

@@ -24,7 +24,7 @@
 from core.osutils.file import File
 from core.osutils.folder import Folder
 from core.osutils.process import Process
-from core.settings.settings import IOS_RUNTIME_PATH, SIMULATOR_NAME
+from core.settings.settings import IOS_RUNTIME_PATH, SIMULATOR_NAME, TEST_RUN_HOME
 from core.tns.replace_helper import ReplaceHelper
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
@@ -312,3 +312,13 @@ def test_350_tns_run_ios_should_start_simulator(self):
             assert Simulator.wait_for_simulator(timeout=10), 'iOS Simulator not started by `tns run ios`!'
         else:
             raise nose.SkipTest('This test is not valid when devices are connected.')
+
+    def test_400_tns_run_on_folder_with_spaces(self):
+        """
+        `tns run ios` for apps with spaces
+        """
+        destination_path = os.path.join(TEST_RUN_HOME, "folder with spaces", "Test App")
+        Folder.copy(src=self.app_name, dst=destination_path)
+        output = Tns.run_ios(attributes={'--path': "\"" + destination_path + "\"", '--justlaunch': ''})
+        assert "Multiple errors were thrown" not in output
+        assert "fail" not in output