fix: template tests

Author: dtopuzov

core/utils/device/device.py

@@ -198,6 +198,8 @@ def get_main_color(self):
     # noinspection PyUnresolvedReferences
     def wait_for_main_color(self, color, timeout=30):
         result = Wait.until(lambda: (self.get_main_color() == color).all(), timeout=timeout)
+        if result:
+            Log.info('Main color is: ' + str(color))
         assert result, "Expected main color: " + str(color) + os.linesep + \
                        "Actual main color: " + str(self.get_main_color())
 

data/templates.py

@@ -19,6 +19,7 @@ class Template(object):
     dr_str = ['Page content goes here']
     tn_str = ['Item 1']
     login = ['Login']
+    auth = ['Your Company Name']
 
     # Blank templates
     BLANK_JS = gen_template_info(name='template-blank', app_type=AppType.JS)
@@ -54,9 +55,9 @@ class Template(object):
     TAB_NAVIGATION_NG = gen_template_info(name='template-tab-navigation-ng', app_type=AppType.NG, texts=tn_str)
 
     # Enterprise auth templates
-    ENTERPRISE_AUTH_JS = gen_template_info(name='template-enterprise-auth', app_type=AppType.JS, texts=login)
-    ENTERPRISE_AUTH_TS = gen_template_info(name='template-enterprise-auth-ts', app_type=AppType.TS, texts=login)
-    ENTERPRISE_AUTH_NG = gen_template_info(name='template-enterprise-auth-ng', app_type=AppType.NG, texts=login)
+    ENTERPRISE_AUTH_JS = gen_template_info(name='template-enterprise-auth', app_type=AppType.JS, texts=auth)
+    ENTERPRISE_AUTH_TS = gen_template_info(name='template-enterprise-auth-ts', app_type=AppType.TS, texts=auth)
+    ENTERPRISE_AUTH_NG = gen_template_info(name='template-enterprise-auth-ng', app_type=AppType.NG, texts=auth)
 
     # Health templates
     HEALTH_SURVEY_NG = gen_template_info(name='template-health-survey-ng', app_type=AppType.NG, texts=login)

tests/live/template_tests.py

@@ -2,6 +2,7 @@
 
 from nose_parameterized import parameterized
 
+from const import Colors
 from core.base_test.tns_test import TnsTest
 from core.enums.env import EnvironmentType
 from core.enums.os_type import OSType
@@ -11,6 +12,7 @@
 from data.templates import Template
 from products.nativescript.app import App
 from products.nativescript.tns import Tns
+from utils.device.adb import Adb
 
 
 # noinspection PyUnusedLocal
@@ -75,19 +77,26 @@ def test(self, template_name, template_info):
         if Settings.ENV != EnvironmentType.LIVE:
             App.update(app_name=app_name)
 
+        # Run Android with bundle
+        Adb.open_home(id=self.emu.id)
+        Tns.run_android(app_name=app_name, device=self.emu.id, bundle=True)
+        self.emu.wait_for_main_color(color=Colors.WHITE)
+        if template_info.texts is not None:
+            for text in template_info.texts:
+                self.emu.wait_for_text(text=text, timeout=30)
+
+        # Run iOS with bundle
+        if Settings.HOST_OS is OSType.OSX:
+            Tns.run_ios(app_name=app_name, device=self.sim.id, bundle=True)
+            self.sim.wait_for_main_color(color=Colors.WHITE)
+            if template_info.texts is not None:
+                for text in template_info.texts:
+                    self.sim.wait_for_text(text=text, timeout=30)
+
         # Build in release
         Tns.build_android(app_name=app_name, release=True, bundle=True, aot=True, uglify=True, snapshot=True)
         if Settings.HOST_OS is OSType.OSX:
             Tns.build_ios(app_name=app_name, release=True, for_device=True, bundle=True, aot=True, uglify=True)
 
-        # Run with bundle
-        Tns.run_android(app_name=app_name, device=self.emu.id, bundle=True, justlaunch=True, wait=True)
-        for text in template_info.texts:
-            self.emu.wait_for_text(text=text, timeout=30)
-        if Settings.HOST_OS is OSType.OSX:
-            Tns.run_ios(app_name=app_name, device=self.sim.id, bundle=True, justlaunch=True, wait=True)
-            for text in template_info.texts:
-                self.sim.wait_for_text(text=text, timeout=30)
-
         # Cleanup
         Folder.clean(local_path)