test

Author: miroslavaivanova

data/sync/hello_world_js.py

@@ -191,7 +191,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit CSS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=css_change)
-    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, device=device,
+    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, device=device,
                                                     hmr=hmr, file_name='app.css', instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,
@@ -202,7 +202,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit JS file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=js_change)
-    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, hmr=hmr, device=device,
+    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, hmr=hmr, device=device,
                                                     file_name=js_file, instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,
@@ -213,7 +213,7 @@ def preview_sync_hello_world_js_ts(app_type, app_name, platform, device, bundle=
 
     # Edit XML file and verify changes are applied
     Sync.replace(app_name=app_name, change_set=xml_change)
-    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, device=device,
+    strings = TnsLogs.preview_file_changed_messages(bundle=bundle, device=device,
                                                     hmr=hmr, file_name='main-page.xml', instrumented=instrumented)
     if hmr and instrumented and Settings.HOST_OS != OSType.WINDOWS:
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings,

products/nativescript/tns_logs.py

@@ -247,8 +247,8 @@ def __webpack_messages():
 
     @staticmethod
     def preview_initial_messages(device, bundle=True, hmr=False, instrumented=False):
-        logs = ["Start sending initial files for device \'{0}\'".format(str(device.model)),
-                "Successfully sent initial files for device \'{0}\'".format(str(device.model))]
+        logs = ["Start sending initial files for device {0}".format(str(device.model)),
+                "Successfully sent initial files for device {0}".format(str(device.model))]
         if bundle or hmr:
             logs.extend(TnsLogs.__webpack_messages())
         if instrumented:
@@ -258,7 +258,7 @@ def preview_initial_messages(device, bundle=True, hmr=False, instrumented=False)
     @staticmethod
     def preview_file_changed_messages(device, file_name, run_type=RunType.INCREMENTAL,
                                       bundle=True, hmr=True, instrumented=False):
-        logs = ["Start syncing changes for device \'{0}\'".format(str(device.model))]
+        logs = ["Start syncing changes for device {0}".format(str(device.model))]
         if bundle or hmr:
             logs.extend(TnsLogs.__webpack_messages())
             logs.append(file_name)

tests/cli/preview/templates/hello_word_js_tests.py

@@ -31,7 +31,7 @@ def setUpClass(cls):
         cls.emu_API24 = DeviceManager.Emulator.ensure_available(Settings.Emulators.EMU_API_24)
 
         # Download Preview and Playground packages
-        Preview.get_app_packages()
+        # Preview.get_app_packages()
 
         # Install Preview and Playground
         Preview.install_preview_app(cls.emu, Platform.ANDROID)
@@ -96,7 +96,7 @@ def test_210_tns_preview_android_livesync_on_two_emulators(self):
         log = File.read(result.log_file)
         url = Preview.get_url(log)
         Preview.run_url(url=url, device=self.emu)
-        strings = TnsLogs.preview_initial_messages(platform=Platform.ANDROID)
+        strings = TnsLogs.preview_initial_messages(device=self.emu)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
         self.emu.wait_for_text(text=Changes.JSHelloWord.JS.old_text, timeout=90)
 
@@ -107,7 +107,7 @@ def test_210_tns_preview_android_livesync_on_two_emulators(self):
         Preview.run_url(url=url, device=self.emu_API24)
         # Here use bundle=False because on consecutive preview build is not executed again
         # and no bundle messages are displayed in log
-        strings = TnsLogs.preview_initial_messages(platform=Platform.ANDROID, bundle=False)
+        strings = TnsLogs.preview_initial_messages(device=self.emu, bundle=False)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
         self.emu_API24.wait_for_text(text=Changes.JSHelloWord.JS.old_text)
 
@@ -136,7 +136,7 @@ def test_210_tns_preview_on_simulator_and_emulator_livesync(self):
         log = File.read(result.log_file)
         url = Preview.get_url(log)
         Preview.run_url(url=url, device=self.emu)
-        strings = TnsLogs.preview_initial_messages(platform=Platform.ANDROID)
+        strings = TnsLogs.preview_initial_messages(device=self.emu)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
         self.emu.wait_for_text(text=Changes.JSHelloWord.JS.old_text)
 
@@ -145,7 +145,7 @@ def test_210_tns_preview_on_simulator_and_emulator_livesync(self):
 
         # Preview on simulator
         Preview.run_url(url=url, device=self.sim)
-        strings = TnsLogs.preview_initial_messages(platform=Platform.IOS)
+        strings = TnsLogs.preview_initial_messages(device=self.sim)
         TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
         self.sim.wait_for_text(text=Changes.JSHelloWord.JS.old_text)