Merge remote-tracking branch 'origin/master'

Author: vhristov5555

tests/build/android/plugin_android_tests.py

@@ -4,6 +4,7 @@
 
 import os
 import time
+import unittest
 
 from core.base_class.BaseClass import BaseClass
 from core.device.helpers.adb import Adb
@@ -129,6 +130,7 @@ def test_300_build_app_with_plugin_added_outside_project(self):
         output = Tns.run_tns_command("plugin", attributes={"--path": self.app_name})
         assert tns_plugin in output
 
+    @unittest.skip("Temporary issues with jcenter.")
     def test_390_plugin_with_promise_in_hooks(self):
         Tns.plugin_add("[email protected]", attributes={"--path": self.app_name})
         output = Tns.prepare_android(attributes={"--path": self.app_name}, assert_success=False)

tests/build/android/prepare_android_tests.py

@@ -138,6 +138,8 @@ def test_310_prepare_should_flatten_scoped_dependencies(self):
         ng_path = os.path.join(self.app_name, TnsAsserts.PLATFORM_ANDROID_NPM_MODULES_PATH, '@angular', 'core')
         assert File.exists(ng_path), "Scoped dependencies are flattened, please see #1783!"
 
+    # TODO: Remove Java related skipping after nativescript-facebook/demo uses android >= 4.1.0
+    @unittest.skipIf(Java.version() != "1.8", "Run only if Java version is 8.")
     @unittest.skipIf(CURRENT_OS == OSType.WINDOWS, "Skip on Windows")
     def test_320_prepare_scoped_plugins(self):
         """

tests/device/run_ios_device_tests.py

@@ -16,6 +16,7 @@
 """
 
 import os
+import unittest
 from datetime import datetime
 from time import sleep
 
@@ -201,9 +202,11 @@ def test_310_tns_run_ios_emulator_should_run_only_on_emulator(self):
         for device_id in self.DEVICES:
             assert app_id + " on device " + device_id not in output, 'App is deployed on {0} device.'.format(device_id)
 
+    @unittest.skip("Skip because of https://github.com/NativeScript/nativescript-cli/issues/3644")
     def test_320_tns_run_ios_specific_device(self):
         """
         `tns run ios --device` should run only on specified device
+        This will also verify justlaunch release console after it completes.
         """
         self.SIMULATOR_ID = Simulator.ensure_available(simulator_name=SIMULATOR_NAME)
         output = Tns.run_ios(attributes={'--path': self.app_name, '--device': self.DEVICE_ID, '--justlaunch': ''},
@@ -292,14 +295,3 @@ def test_400_tns_run_ios_should_not_crash_when_uninstall_app(self):
         strings = ['Successfully installed', 'Successfully synced application']
         Tns.wait_for_log(log_file=log, string_list=strings, timeout=180, check_interval=10)
         assert Device.wait_for_text(device_id=self.DEVICE_ID, text="TEST"), "XML changes not synced on device!"
-
-    def test_404_tns_run_ios_on_not_existing_device_should_not_start_simualtor(self):
-        """
-        `tns run ios --device fakeID` should show error and emulator should not be started (test for issue #2728)
-        """
-        Simulator.stop()
-        output = Tns.run_ios(attributes={'--path': self.app_name, '--device': 'fakeID', '--justlaunch': ''},
-                             assert_success=False)
-        TnsAsserts.invalid_device(output=output)
-        sleep(10)
-        assert not Simulator.is_running()[0], 'iOS Simulator started by `tns run ios --device fakeID`!'

tests/regression/regression_tests_js.py

@@ -73,17 +73,17 @@ def test_100_run_android(self):
         Helpers.android_screen_match(image=self.image_original, timeout=80)
 
         # Change JS, XML and CSS
-        ReplaceHelper.replace(self.app_name, self.js_change)
-        ReplaceHelper.replace(self.app_name, self.xml_change)
-        ReplaceHelper.replace(self.app_name, self.css_change)
+        ReplaceHelper.replace(self.app_name, self.js_change, sleep=10)
+        ReplaceHelper.replace(self.app_name, self.xml_change, sleep=10)
+        ReplaceHelper.replace(self.app_name, self.css_change, sleep=10)
 
         # Verify application looks correct
         Helpers.android_screen_match(image=self.image_change, timeout=80)
 
         # Revert changes
-        ReplaceHelper.rollback(self.app_name, self.js_change)
-        ReplaceHelper.rollback(self.app_name, self.xml_change)
-        ReplaceHelper.rollback(self.app_name, self.css_change)
+        ReplaceHelper.rollback(self.app_name, self.js_change, sleep=10)
+        ReplaceHelper.rollback(self.app_name, self.xml_change, sleep=10)
+        ReplaceHelper.rollback(self.app_name, self.css_change, sleep=10)
 
         # Verify application looks correct
         Helpers.android_screen_match(image=self.image_original, timeout=80)

tests/regression/regression_tests_ng.py

@@ -71,17 +71,17 @@ def test_100_run_android(self):
         Helpers.android_screen_match(image=self.image_original, timeout=80)
 
         # Change JS, XML and CSS
-        ReplaceHelper.replace(self.app_name, self.ts_change)
-        ReplaceHelper.replace(self.app_name, self.html_change)
-        ReplaceHelper.replace(self.app_name, self.css_change)
+        ReplaceHelper.replace(self.app_name, self.ts_change, sleep=10)
+        ReplaceHelper.replace(self.app_name, self.html_change, sleep=10)
+        ReplaceHelper.replace(self.app_name, self.css_change, sleep=10)
 
         # Verify application looks correct
         Helpers.android_screen_match(image=self.image_change, timeout=80)
 
         # Revert changes
-        ReplaceHelper.rollback(self.app_name, self.html_change)
-        ReplaceHelper.rollback(self.app_name, self.ts_change)
-        ReplaceHelper.rollback(self.app_name, self.css_change)
+        ReplaceHelper.rollback(self.app_name, self.html_change, sleep=10)
+        ReplaceHelper.rollback(self.app_name, self.ts_change, sleep=10)
+        ReplaceHelper.rollback(self.app_name, self.css_change, sleep=10)
 
         # Verify application looks correct
         Helpers.android_screen_match(image=self.image_original, timeout=80)

tests/simulator/run_ios_tests.py

@@ -500,7 +500,8 @@ def test_390_tns_run_ios_should_warn_if_package_ids_do_not_match(self):
                "<string>org.nativescript.myapp</string>"
         info = os.path.join(self.app_name, 'app', 'App_Resources', 'iOS', 'Info.plist')
         File.replace(file_path=info, str1=str1, str2=str2)
-        output = Tns.run_ios(attributes={'--path': self.app_name, '--justlaunch': ''})
+        # `--emulator` added to workaround https://github.com/NativeScript/nativescript-cli/issues/3644
+        output = Tns.run_ios(attributes={'--path': self.app_name, '--emulator': '', '--justlaunch': ''})
         assert "[WARNING]: The CFBundleIdentifier key inside the 'Info.plist' will be overriden" in output
         assert "Successfully synced application org.nativescript.TestApp" in output
 
@@ -511,12 +512,13 @@ def test_400_tns_run_on_folder_with_spaces(self):
         destination_path = os.path.join(TEST_RUN_HOME, "folder with spaces", "Test App")
         Folder.cleanup(folder=destination_path)
         Folder.copy(src=self.app_name, dst=destination_path)
-        output = Tns.run_ios(attributes={'--path': "\"" + destination_path + "\"", '--justlaunch': ''})
+        output = Tns.run_ios(
+            attributes={'--path': "\"" + destination_path + "\"", '--emulator': '', '--justlaunch': ''})
         assert "Multiple errors were thrown" not in output
         assert "fail" not in output
 
     @unittest.skip("Ignore because of https://github.com/NativeScript/nativescript-cli/issues/3625")
-    def test_404_run_on_invalid_device_id(self):
+    def test_404_tns_run_ios_on_not_existing_device_should_not_start_simulator(self):
         Simulator.stop()
         output = Tns.run_ios(attributes={'--path': self.app_name, '--device': 'fakeId', '--justlaunch': ''},
                              assert_success=False)

tests/webpack/hello_world_js_tests.py

@@ -68,8 +68,7 @@ def apply_changes(app_name, log, platform):
 
         ReplaceHelper.replace(app_name, WebPackHelloWorldJS.css_change, sleep=10)
         if platform == Platform.ANDROID:
-            strings = ['Successfully transferred app.css', 'Successfully synced application']
-            Tns.wait_for_log(log_file=log, string_list=strings, clean_log=False)
+            Tns.wait_for_log(log_file=log, string_list=['app.css'], clean_log=False)
 
         Tns.wait_for_log(log_file=log, string_list=Helpers.wp_sync, not_existing_string_list=Helpers.wp_errors,
                          timeout=120)

tests/webpack/hello_world_ng_tests.py

@@ -65,13 +65,11 @@ def apply_changes(app_name, log, platform):
 
         ReplaceHelper.replace(app_name, WebPackHelloWorldNG.html_change, sleep=10)
         if platform == Platform.ANDROID:
-            strings = ['Successfully transferred items.component.html', 'Successfully synced application']
-            Tns.wait_for_log(log_file=log, string_list=strings, clean_log=False)
+            Tns.wait_for_log(log_file=log, string_list=['items.component.html'], clean_log=False)
 
         ReplaceHelper.replace(app_name, WebPackHelloWorldNG.css_change, sleep=10)
         if platform == Platform.ANDROID:
-            strings = ['Successfully transferred app.css', 'Successfully synced application']
-            Tns.wait_for_log(log_file=log, string_list=strings, clean_log=False)
+            Tns.wait_for_log(log_file=log, string_list=['app.css'], clean_log=False)
 
         Tns.wait_for_log(log_file=log, string_list=Helpers.wp_sync, not_existing_string_list=Helpers.wp_errors,
                          timeout=120)

tests/webpack/hello_world_ts_tests.py

@@ -70,8 +70,7 @@ def apply_changes(app_name, log, platform):
 
         ReplaceHelper.replace(app_name, WebPackHelloWorldTS.css_change, sleep=10)
         if platform == Platform.ANDROID:
-            strings = ['Successfully transferred app.css', 'Successfully synced application']
-            Tns.wait_for_log(log_file=log, string_list=strings, clean_log=False)
+            Tns.wait_for_log(log_file=log, string_list=['app.css'], clean_log=False)
 
         Tns.wait_for_log(log_file=log, string_list=Helpers.wp_sync, not_existing_string_list=Helpers.wp_errors,
                          timeout=120)