diff --git a/data/changes.py b/data/changes.py index e9df425c..1af77582 100644 --- a/data/changes.py +++ b/data/changes.py @@ -191,8 +191,8 @@ class MasterDetailVUE(object): old_value='Car List', new_value='Master Detail', old_text='Car List', new_text='Master Detail') VUE_STYLE = ChangeSet(file_path=os.path.join('app', 'components', 'CarList.vue'), - old_value='background-color: $background-light;', - new_value='background-color: rgb(229, 4, 5);', + old_value='background-color: background-alt-10)', + new_value='background-color: accent)', old_color=Colors.WHITE, new_color=Colors.RED_DARK) VUE_DETAIL_PAGE_TEMPLATE = ChangeSet(file_path=os.path.join('app', 'components', 'CarDetails.vue'), old_value='', new_value='', diff --git a/data/sync/blank_vue.py b/data/sync/blank_vue.py index 830df61f..84716f03 100644 --- a/data/sync/blank_vue.py +++ b/data/sync/blank_vue.py @@ -16,29 +16,28 @@ from products.nativescript.tns_logs import TnsLogs -def __run_vue(app_name, platform, bundle, hmr): +def __run_vue(app_name, platform, hmr): # Execute `tns run` and wait until logs are OK - return Tns.run(app_name=app_name, platform=platform, emulator=True, wait=False, bundle=bundle, hmr=hmr) + return Tns.run(app_name=app_name, platform=platform, emulator=True, wait=False, hmr=hmr) -def __preview_vue(app_name, platform, device, bundle, hmr): +def __preview_vue(app_name, platform, device, hmr): # Execute `tns run` and wait until logs are OK - return Preview.run_app(app_name=app_name, bundle=bundle, hmr=hmr, platform=platform, device=device, - click_open_alert=True) + return Preview.run_app(app_name=app_name, hmr=hmr, platform=platform, device=device, click_open_alert=True) -def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): +def __workflow(preview, app_name, platform, device, hmr=True): # Execute tns command if preview: - result = __preview_vue(app_name=app_name, platform=platform, device=device, bundle=bundle, hmr=hmr) + result = __preview_vue(app_name=app_name, platform=platform, device=device, hmr=hmr) else: - result = __run_vue(app_name=app_name, platform=platform, bundle=bundle, hmr=hmr) + result = __run_vue(app_name=app_name, platform=platform, hmr=hmr) if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.FULL, bundle=bundle, - hmr=hmr, app_type=AppType.VUE) + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.UNKNOWN, hmr=hmr, + app_type=AppType.VUE) TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, timeout=240) # Verify it looks properly @@ -58,8 +57,8 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, - bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='Home.vue') + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, hmr=hmr, + app_type=AppType.VUE, file_name='Home.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) device.wait_for_text(text=Changes.BlankVue.VUE_SCRIPT.new_text) @@ -69,8 +68,8 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, - bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='Home.vue') + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, hmr=hmr, + app_type=AppType.VUE, file_name='Home.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) device.wait_for_text(text=Changes.BlankVue.VUE_TEMPLATE.new_text) @@ -80,8 +79,8 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, - bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='Home.vue') + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, hmr=hmr, + app_type=AppType.VUE, file_name='Home.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) style_applied = Wait.until(lambda: device.get_pixels_by_color(Colors.RED) > 100) @@ -92,8 +91,8 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, - bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='Home.vue') + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, hmr=hmr, + app_type=AppType.VUE, file_name='Home.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) device.wait_for_text(text=Changes.BlankVue.VUE_SCRIPT.old_text) @@ -103,8 +102,8 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, - bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='Home.vue') + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, hmr=hmr, + app_type=AppType.VUE, file_name='Home.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) device.wait_for_text(text=Changes.BlankVue.VUE_TEMPLATE.old_text) @@ -114,9 +113,8 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): if preview: Log.info('Skip logs checks.') else: - strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, - bundle=bundle, - hmr=hmr, app_type=AppType.VUE, file_name='Home.vue') + strings = TnsLogs.run_messages(app_name=app_name, platform=platform, run_type=RunType.INCREMENTAL, hmr=hmr, + app_type=AppType.VUE, file_name='Home.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) @@ -130,9 +128,9 @@ def __workflow(preview, app_name, platform, device, bundle=True, hmr=True): device.screen_match(expected_image=initial_state, tolerance=1.0, timeout=30) -def sync_blank_vue(app_name, platform, device, bundle=True, hmr=True): - __workflow(preview=False, app_name=app_name, platform=platform, device=device, bundle=bundle, hmr=hmr) +def sync_blank_vue(app_name, platform, device, hmr=True): + __workflow(preview=False, app_name=app_name, platform=platform, device=device, hmr=hmr) -def preview_blank_vue(app_name, platform, device, bundle=True, hmr=True): - __workflow(preview=True, app_name=app_name, platform=platform, device=device, bundle=bundle, hmr=hmr) +def preview_blank_vue(app_name, platform, device, hmr=True): + __workflow(preview=True, app_name=app_name, platform=platform, device=device, hmr=hmr) diff --git a/data/sync/master_detail_vue.py b/data/sync/master_detail_vue.py index 4621bf86..127e22c8 100644 --- a/data/sync/master_detail_vue.py +++ b/data/sync/master_detail_vue.py @@ -57,7 +57,7 @@ def sync_master_detail_vue(app_name, platform, device, bundle=True, hmr=True): bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='CarList.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) - style_applied = Wait.until(lambda: device.get_pixels_by_color(Colors.RED_DARK) > 200) + style_applied = Wait.until(lambda: device.get_pixels_by_color(Colors.LIGHT_BLUE) > 200) assert style_applied, 'Failed to sync changes in style.' # Revert styling in .vue file @@ -66,7 +66,7 @@ def sync_master_detail_vue(app_name, platform, device, bundle=True, hmr=True): bundle=bundle, hmr=hmr, app_type=AppType.VUE, file_name='CarList.vue') TnsLogs.wait_for_log(log_file=result.log_file, string_list=strings, not_existing_string_list=not_existing_string_list) - style_applied = Wait.until(lambda: device.get_pixels_by_color(Colors.WHITE) > 200) + style_applied = Wait.until(lambda: device.get_pixels_by_color(Colors.LIGHT_BLUE) < 200) assert style_applied, 'Failed to sync changes in style.' device.wait_for_text(text="Ford KA")