Merge remote-tracking branch 'origin/master'

Author: vhristov5555

data/issues/nativescript-cli-3650/main-page.js

@@ -6,6 +6,6 @@ function pageLoaded(args) {
     console.log("Page loaded " + ++count + " times.");
 
     var objTC = new TestClass();
-    objTC.sayHey();
+    console.log(objTC.sayHey());
 }
 exports.pageLoaded = pageLoaded;

data/plugins/sample-plugin/src/platforms/ios/src/TestClass.h

@@ -2,6 +2,6 @@
 
 @interface TestClass : NSObject
 
-- (void)sayHey;
+- (NSString *)sayHey;
 
 @end

data/plugins/sample-plugin/src/platforms/ios/src/TestClass.m

@@ -2,8 +2,8 @@
 
 @implementation TestClass
 
-- (void)sayHey{
-      NSLog(@"Hey!");
+- (NSString *)sayHey{
+      return @"Hey!";
 }
 
 @end

tests/device/debug_device_tests.py

@@ -8,6 +8,13 @@
 from core.tns.tns import Tns
 from core.tns.tns_platform_type import Platform
 from core.osutils.command import run
+from time import sleep
+from enum import Enum
+from core.osutils.process import Process
+
+class DebugMode(Enum):
+    DEFAULT = 0
+    START = 1
 
 class DebugBothPlatformsTests(BaseClass):
     ANDROID_DEVICES = Device.get_ids(platform=Platform.ANDROID, include_emulators=True)
@@ -40,6 +47,47 @@ def tearDown(self):
     def tearDownClass(cls):
         BaseClass.tearDownClass()
 
+    @staticmethod
+    def attach_chrome(log, mode=DebugMode.DEFAULT, port="41000"):
+        """
+        Attach chrome dev tools and verify logs
+        :type log: Log file of `tns debug ios` command.
+        """
+
+        # Check initial logs
+        strings = ["Setting up debugger proxy...", "Press Ctrl + C to terminate, or disconnect.",
+                   "Opened localhost", "To start debugging, open the following URL in Chrome"]
+        Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10, clean_log=False)
+
+        # Attach Chrome DevTools
+        url = run(command="grep chrome-devtools " + log)
+        text_log = File.read(log)
+        assert "chrome-devtools://devtools/remote" in text_log, "Debug url not printed in output of 'tns debug ios'."
+        assert "localhost:" + port in text_log, "Wrong port of debug url:" + url
+        Chrome.start(url)
+
+        # Verify debugger attached
+        strings = ["Frontend client connected", "Backend socket created"]
+        if mode != DebugMode.START:
+            strings.extend(["Loading inspector modules",
+                            "Finished loading inspector modules",
+                            "NativeScript debugger attached"])
+        Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10, clean_log=False)
+
+        # Verify debugger not disconnected
+        sleep(10)
+        output = File.read(log)
+        assert "socket closed" not in output, "Debugger disconnected."
+        assert "detached" not in output, "Debugger disconnected."
+        assert not Process.is_running('NativeScript Inspector'), "iOS Inspector running instead of ChromeDev Tools."
+
+    @staticmethod
+    def assert_not_detached(log):
+        output = File.read(log)
+        assert "socket created" in output, "Debugger not attached at all.\n Log:\n" + output
+        assert "socket closed" not in output, "Debugger disconnected.\n Log:\n" + output
+        assert "detached" not in output, "Debugger disconnected.\n Log:\n" + output
+
     def __verify_debugger_start(self, log):
         strings = ['NativeScript Debugger started', 'To start debugging, open the following URL in Chrome',
                    'chrome-devtools', 'localhost:4000']
@@ -64,12 +112,6 @@ def test_001_tns_run_android(self):
         for android_device_id in self.ANDROID_DEVICES:
             strings.append(android_device_id)
         Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10, clean_log=False)
-
-        # Verify app is deployed and running on all available android devices
-        for device_id in self.ANDROID_DEVICES:
-            Device.wait_until_app_is_running(app_id=Tns.get_app_id(self.app_name), device_id=device_id, timeout=30)
-
-        log = Tns.debug_android(attributes={'--path': self.app_name})
         self.__verify_debugger_start(log)
 
         # Get Chrome URL and open it
@@ -78,14 +120,7 @@ def test_001_tns_run_android(self):
 
     def test_002_tns_run_ios(self):
         log = Tns.debug_ios(attributes={'--path': self.app_name})
-        strings = ['Successfully installed on device with identifier']
-        for ios_device_id in self.IOS_DEVICES:
-            strings.append(ios_device_id)
-        Tns.wait_for_log(log_file=log, string_list=strings, timeout=120, check_interval=10, clean_log=False)
-
-        log = Tns.debug_ios(attributes={'--path': self.app_name})
-        self.__verify_debugger_start(log)
-
-        # Get Chrome URL and open it
-        url = run(command="grep chrome-devtools " + log)
-        Chrome.start(url)
+        self.attach_chrome(log)
+        strings = ['Successfully started on device with identifier']
+        Tns.wait_for_log(log_file=log, string_list= strings, clean_log=False)
+        self.assert_not_detached(log)

tests/simulator/run_ios_tests.py

@@ -351,15 +351,15 @@ def test_300_tns_run_ios_just_launch_and_incremental_builds(self):
                             device_id=self.SIMULATOR_ID, expected_image='livesync-hello-world_js_css_xml')
 
     def test_315_tns_run_ios_change_appResources_check_per_platform(self):
-        #https://github.com/NativeScript/nativescript-cli/pull/3619
+        # https://github.com/NativeScript/nativescript-cli/pull/3619
         output = Tns.run_ios(attributes={'--path': self.app_name, '--emulator': ''}, wait=False, assert_success=False)
         strings = ['Project successfully built', 'Successfully installed on device with identifier', self.SIMULATOR_ID]
         Tns.wait_for_log(log_file=output, string_list=strings, timeout=150, check_interval=10)
 
         source = os.path.join('data', 'issues', 'nativescript-cli-3619', 'icon-1025.png')
         target = os.path.join(self.app_name, 'app', 'App_Resources', 'iOS', 'Assets.xcassets', 'AppIcon.appiconset')
         File.copy(source, target)
-        strings = ['Xcode build' ]
+        strings = ['Xcode build']
         Tns.wait_for_log(log_file=output, string_list=strings, clean_log=False)
         assert "Gradle build" not in output
 
@@ -532,7 +532,6 @@ def test_380_tns_run_ios_plugin_dependencies(self):
         Device.screen_match(device_name=SIMULATOR_NAME, device_id=self.SIMULATOR_ID,
                             expected_image='livesync-hello-world_home')
 
-    @unittest.skip("NSLog is not shown when run the test but is show when run the same test app locally")
     def test_385_tns_run_ios_source_code_in_ios_part_plugin(self):
         """
         https://github.com/NativeScript/nativescript-cli/issues/3650