feat: test for preview with NG (#62)

endarova · web-flow · commit 2cb2535b9ad4 · 2019-02-28T11:24:41.000+02:00
* Add test for preview NG. Extract common logic in run_app method

* fix adb install method

* Fix linter errors
diff --git a/core/utils/device/adb.py b/core/utils/device/adb.py
@@ -177,6 +177,6 @@ def install(apk_path, device_id):
         :param apk_path: File path to .apk.
         :param device_id: Device id.
         """
-        result = Adb.__run_adb_command(command='install -r {0} {1}'.format(apk_path, device_id), timeout=60)
+        result = Adb.__run_adb_command(command='-s {0} install -r {1}'.format(device_id, apk_path), timeout=60)
         assert 'Success' in result.output, 'Failed to install {0}. Output: {1}'.format(apk_path, result.output)
         Log.info('{0} installed successfully on {1}.'.format(apk_path, device_id))
diff --git a/data/sync/hello_world_js.py b/data/sync/hello_world_js.py
@@ -3,10 +3,8 @@
 """
 
 import os
-import time
 
 from core.enums.app_type import AppType
-from core.enums.platform_type import Platform
 from core.settings import Settings
 from core.utils.file_utils import File
 from core.utils.wait import Wait
@@ -133,20 +131,8 @@ def __sync_hello_world_js_ts(app_type, app_name, platform, device,
 
 def preview_hello_world_js_ts(app_name, platform, device, bundle=False, hmr=False, uglify=False, aot=False,
                               instrumented=False):
-    result = Tns.preview(app_name=app_name, bundle=bundle, hmr=hmr, aot=aot, uglify=uglify)
-
-    # Read the log and extract the url to load the app on emulator
-    log = File.read(result.log_file)
-    url = Preview.get_url(log)
-    Preview.run_app(url, device.id, platform)
-    # When you run preview on ios simulator on first run confirmation dialog is showh. This script will dismiss it
-    if platform == Platform.IOS:
-        time.sleep(2)
-        Preview.dismiss_simulator_alert()
-
-    # Verify logs
-    strings = TnsLogs.preview_initial_messages(platform=platform, hmr=hmr, bundle=bundle, instrumented=instrumented)
-    TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
+    result = Preview.run_app(app_name=app_name, bundle=bundle, hmr=hmr, aot=aot, uglify=uglify, platform=platform,
+                             device=device, instrumented=instrumented)
 
     # Verify app looks properly
     device.wait_for_text(text=Changes.JSHelloWord.JS.old_text, timeout=60, retry_delay=5)
diff --git a/data/sync/hello_world_ng.py b/data/sync/hello_world_ng.py
@@ -3,7 +3,6 @@
 """
 
 import os
-
 from core.enums.app_type import AppType
 from core.enums.platform_type import Platform
 from core.settings import Settings
@@ -12,6 +11,7 @@
 from products.nativescript.run_type import RunType
 from products.nativescript.tns import Tns
 from products.nativescript.tns_logs import TnsLogs
+from products.nativescript.preview_helpers import Preview
 
 
 def sync_hello_world_ng(app_name, platform, device, bundle=False, uglify=False, aot=False, hmr=False,
@@ -86,3 +86,56 @@ def sync_hello_world_ng(app_name, platform, device, bundle=False, uglify=False,
 
     # Assert final and initial states are same
     device.screen_match(expected_image=initial_state, tolerance=1.0, timeout=30)
+
+
+def preview_hello_world_ng(app_name, platform, device, bundle=False, hmr=False, uglify=False, aot=False,
+                           instrumented=False):
+    result = Preview.run_app(app_name=app_name, bundle=bundle, hmr=hmr, aot=aot, uglify=uglify, platform=platform,
+                             device=device, instrumented=instrumented)
+
+    # Verify app looks properly
+    device.wait_for_text(text=Changes.NGHelloWorld.TS.old_text)
+    device.wait_for_main_color(color=Colors.WHITE)
+    initial_state = os.path.join(Settings.TEST_OUT_IMAGES, device.name, 'initial_state.png')
+    device.get_screen(path=initial_state)
+    return result
+
+
+def preview_sync_hello_world_ng(app_name, platform, device, bundle=False, hmr=False, uglify=False,
+                                aot=False, instrumented=False):
+    result = preview_hello_world_ng(app_name=app_name, platform=platform, device=device, bundle=bundle, hmr=hmr,
+                                    uglify=uglify, aot=aot, instrumented=instrumented)
+
+    # Edit TS file and verify changes are applied
+    Sync.replace(app_name=app_name, change_set=Changes.NGHelloWorld.TS)
+    device.wait_for_text(text=Changes.NGHelloWorld.TS.new_text)
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, run_type=RunType.INCREMENTAL, bundle=bundle,
+                                                    file_name='item.service.ts', hmr=hmr, instrumented=instrumented)
+    TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=180)
+
+    # Edit HTML file and verify changes are applied
+    Sync.replace(app_name=app_name, change_set=Changes.NGHelloWorld.HTML)
+    if platform == Platform.IOS:
+        for number in ["10", "1"]:
+            device.wait_for_text(text=number)
+    else:
+        for number in ["8", "9"]:
+            device.wait_for_text(text=number)
+    assert not device.is_text_visible(text=Changes.NGHelloWorld.TS.new_text)
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, file_name='items.component.html',
+                                                    hmr=hmr, instrumented=instrumented)
+    TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=180)
+
+    # Edit CSS file and verify changes are applied
+    Sync.replace(app_name=app_name, change_set=Changes.NGHelloWorld.CSS)
+    device.wait_for_main_color(color=Colors.DARK)
+    if platform == Platform.IOS:
+        for number in ["10", "1"]:
+            device.wait_for_text(text=number)
+    else:
+        for number in ["8", "9"]:
+            device.wait_for_text(text=number)
+    assert not device.is_text_visible(text=Changes.NGHelloWorld.TS.new_text)
+    strings = TnsLogs.preview_file_changed_messages(platform=platform, bundle=bundle, file_name='app.css',
+                                                    hmr=hmr, instrumented=instrumented)
+    TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=180)
diff --git a/products/nativescript/preview_helpers.py b/products/nativescript/preview_helpers.py
@@ -1,13 +1,15 @@
 import os
 import re
-
+import time
 from core.enums.platform_type import Platform
 from core.settings import Settings
 from core.settings.Settings import TEST_SUT_HOME, TEST_RUN_HOME
 from core.utils.device.adb import Adb, ADB_PATH
 from core.utils.device.simctl import Simctl
 from core.utils.file_utils import File
 from core.utils.run import run
+from products.nativescript.tns import Tns
+from products.nativescript.tns_logs import TnsLogs
 
 
 class Preview(object):
@@ -72,9 +74,9 @@ def get_url(output):
         return url
 
     @staticmethod
-    def run_app(url, device_id, platform):
+    def run_url(url, device_id, platform):
         """
-        Runs project in the Preview App on simulator or emulator.
+        Runs your project in the Preview App on simulator or emulator
         """
         if platform is Platform.IOS:
             cmd = "xcrun simctl openurl {0} {1}.".format(device_id, url)
@@ -93,3 +95,22 @@ def dismiss_simulator_alert():
         dismiss_sim_alert = os.path.join(TEST_RUN_HOME, 'assets', 'scripts', 'send_enter_to_simulator.scpt')
         command = "osascript " + dismiss_sim_alert
         run(command)
+
+    @staticmethod
+    def run_app(app_name, platform, device, bundle=False, hmr=False, uglify=False, aot=False,
+                instrumented=False):
+        result = Tns.preview(app_name=app_name, bundle=bundle, hmr=hmr, aot=aot, uglify=uglify)
+
+        # Read the log and extract the url to load the app on emulator
+        log = File.read(result.log_file)
+        url = Preview.get_url(log)
+        Preview.run_url(url, device.id, platform)
+        # When you run preview on ios simulator on first run confirmation dialog is showh. This script will dismiss it
+        if platform == Platform.IOS:
+            time.sleep(2)
+            Preview.dismiss_simulator_alert()
+
+        # Verify logs
+        strings = TnsLogs.preview_initial_messages(platform=platform, hmr=hmr, bundle=bundle, instrumented=instrumented)
+        TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings)
+        return result
diff --git a/products/nativescript/tns_logs.py b/products/nativescript/tns_logs.py
@@ -237,7 +237,8 @@ def preview_file_changed_messages(platform, file_name, run_type=RunType.INCREMEN
             logs.extend(TnsLogs.__webpack_messages())
             logs.append(file_name)
         else:
-            logs.append('Successfully synced {0} for platform {1}'.format(file_name, str(platform)))
+            logs.append('Successfully synced')
+            logs.append('{0} for platform {1}'.format(file_name.replace('.ts', '.js'), str(platform)))
         if hmr:
             logs.append('hot-update.json')
             logs.append('HMR: Checking for updates to the bundle with hmr hash')
diff --git a/tests/cli/preview/templates/hello_word_js_tests.py b/tests/cli/preview/templates/hello_word_js_tests.py
@@ -65,7 +65,7 @@ def test_200_preview_android_bundle(self):
         preview_sync_hello_world_js_ts(app_type=AppType.JS, app_name=self.app_name, platform=Platform.ANDROID,
                                        device=self.emu, instrumented=True, bundle=True)
 
-    def test_110_preview_android_hmr(self):
+    def test_205_preview_android_hmr(self):
         """Preview project on emulator. Make valid changes in JS, CSS and XML"""
         # preview_hello_world_js_ts(self.app_name, Platform.ANDROID, self.emu)
         preview_sync_hello_world_js_ts(app_type=AppType.JS, app_name=self.app_name, platform=Platform.ANDROID,
diff --git a/tests/cli/preview/templates/hello_word_ng_tests.py b/tests/cli/preview/templates/hello_word_ng_tests.py
@@ -1,8 +1,88 @@
+import os
+import unittest
 from core.base_test.tns_test import TnsTest
+from core.base_test.tns_run_test import TnsRunTest
+from core.enums.os_type import OSType
+from core.enums.platform_type import Platform
+from core.settings import Settings
+from core.utils.file_utils import File, Folder
+from data.sync.hello_world_ng import preview_sync_hello_world_ng
+from data.templates import Template
+from products.nativescript.tns import Tns
+from products.nativescript.preview_helpers import Preview
 
 
-class TnsRunPreviewNGTests(TnsTest):
+class TnsPreviewNGTests(TnsRunTest):
+    app_name = Settings.AppName.DEFAULT
+    source_project_dir = os.path.join(Settings.TEST_RUN_HOME, app_name)
+    target_project_dir = os.path.join(Settings.TEST_RUN_HOME, 'data', 'temp', app_name)
 
     @classmethod
     def setUpClass(cls):
-        TnsTest.setUpClass()
+        TnsRunTest.setUpClass()
+
+        # Download Preview and Playground packages
+        Preview.get_app_packages()
+
+        # Install Preview and Playground
+        Preview.install_preview_app(cls.emu, Platform.ANDROID)
+        if Settings.HOST_OS is OSType.OSX:
+            Preview.install_preview_app(cls.sim, Platform.IOS)
+            Preview.install_playground_app(cls.sim, Platform.IOS)
+
+        # Create app
+        Tns.create(app_name=cls.app_name, template=Template.HELLO_WORLD_NG.local_package, update=True)
+        src = os.path.join(Settings.TEST_RUN_HOME, 'assets', 'logs', 'hello-world-ng', 'main.ts')
+        target = os.path.join(Settings.TEST_RUN_HOME, cls.app_name, 'src')
+        File.copy(src=src, target=target)
+        src = os.path.join(Settings.TEST_RUN_HOME, 'assets', 'logs', 'hello-world-ng', 'items.component.ts')
+        target = os.path.join(Settings.TEST_RUN_HOME, cls.app_name, 'src', 'app', 'item')
+        File.copy(src=src, target=target)
+
+        # Copy TestApp to data folder.
+        Folder.copy(source=cls.source_project_dir, target=cls.target_project_dir)
+
+    def setUp(self):
+        TnsTest.setUp(self)
+        # "src" folder of TestApp will be restored before each test.
+        # This will ensure failures in one test do not cause common failures.
+        source_src = os.path.join(self.target_project_dir, 'src')
+        target_src = os.path.join(self.source_project_dir, 'src')
+        Folder.clean(target_src)
+        Folder.copy(source=source_src, target=target_src)
+
+
+class PreviewNGTests(TnsPreviewNGTests):
+
+    def test_100_preview_android(self):
+        """Preview project on emulator. Make valid changes in TS, CSS and HTML"""
+        preview_sync_hello_world_ng(app_name=self.app_name, platform=Platform.ANDROID,
+                                    device=self.emu, instrumented=True)
+
+    @unittest.skipIf(Settings.HOST_OS != OSType.OSX, 'iOS tests can be executed only on macOS.')
+    def test_100_preview_ios(self):
+        """Preview project on simulator. Make valid changes in TS, CSS and HTML"""
+        preview_sync_hello_world_ng(app_name=self.app_name, platform=Platform.IOS,
+                                    device=self.sim, instrumented=True)
+
+    def test_200_preview_android_bundle(self):
+        """Preview project on emulator with --bundle. Make valid changes in TS, CSS and HTML"""
+        preview_sync_hello_world_ng(app_name=self.app_name, platform=Platform.ANDROID,
+                                    device=self.emu, instrumented=True, bundle=True)
+
+    @unittest.skipIf(Settings.HOST_OS != OSType.OSX, 'iOS tests can be executed only on macOS.')
+    def test_200_preview_ios_hmr(self):
+        """Preview project on simulator with --bundle. Make valid changes in TS, CSS and HTML"""
+        preview_sync_hello_world_ng(app_name=self.app_name, platform=Platform.IOS,
+                                    device=self.sim, instrumented=True, bundle=True)
+
+    def test_205_preview_android_hmr(self):
+        """Preview project on emulator with --hmr. Make valid changes in TS, CSS and HTML"""
+        preview_sync_hello_world_ng(app_name=self.app_name, platform=Platform.ANDROID,
+                                    device=self.emu, instrumented=True, hmr=True)
+
+    @unittest.skipIf(Settings.HOST_OS != OSType.OSX, 'iOS tests can be executed only on macOS.')
+    def test_205_preview_ios_hmr(self):
+        """Preview project on simulator with --hmr. Make valid changes in TS, CSS and HTML"""
+        preview_sync_hello_world_ng(app_name=self.app_name, platform=Platform.IOS,
+                                    device=self.sim, instrumented=True, hmr=True)
