From bd81dc2b58673b55111877c695cd2e5c5d49ded9 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Mon, 18 Nov 2019 17:05:05 +0200 Subject: [PATCH 1/2] chore: change the way we assert changes to improve tests stability --- data/changes.py | 12 ++++++------ data/sync/plugin_src.py | 7 +------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/data/changes.py b/data/changes.py index 2dfff6a0..0826b3e0 100644 --- a/data/changes.py +++ b/data/changes.py @@ -203,12 +203,12 @@ class DateTimePicker(object): COMMON_TS = ChangeSet(file_path=os.path.join(DATETIME_PICKER_PATH, 'ui', 'date-picker-field.common.ts'), old_value='name: "date",', new_value='name: "date", defaultValue: new Date(),') - ANDROID_TS = ChangeSet(file_path=os.path.join(DATETIME_PICKER_PATH, 'datetimepicker.android.ts'), - old_value='datePicker.init(date.getFullYear(), date.getMonth(), date.getDate(), null);', - new_value='datePicker.init(2010, date.getMonth(), date.getDate(), null);') - IOS_TS = ChangeSet(file_path=os.path.join(DATETIME_PICKER_PATH, 'datetimepicker.ios.ts'), - old_value='pickerView.date = date;', - new_value='date.setFullYear(2010); pickerView.date = date;') + ANDROID_TS = ChangeSet(file_path=os.path.join(DATETIME_PICKER_PATH, 'ui', 'date-picker-field.android.ts'), + old_value='this.nativeView.setFocusable(false);', + new_value='this.nativeView.setFocusable(false); this.hint = "testMessage";') + IOS_TS = ChangeSet(file_path=os.path.join(DATETIME_PICKER_PATH, 'ui', 'date-picker-field.ios.ts'), + old_value='export class DatePickerField extends DatePickerFieldBase {', + new_value='export class DatePickerField extends DatePickerFieldBase {initNativeView() {this.hint = "testMessage";}') class AppFileChanges(object): CHANGE_XML_INVALID_SYNTAX = ChangeSet(file_path=os.path.join('app', 'main-page.xml'), diff --git a/data/sync/plugin_src.py b/data/sync/plugin_src.py index 0984956a..caa52464 100644 --- a/data/sync/plugin_src.py +++ b/data/sync/plugin_src.py @@ -96,9 +96,4 @@ def sync_plugin_platform_spec(app_name, app_type, log_result, platform, device, app_type=app_type) TnsLogs.wait_for_log(log_file=log_result.log_file, string_list=strings, timeout=60) device.click(text="DatePickerField") - device.wait_for_text("select date") - device.click(text="select date") - device.click(text="OK") - date = datetime.date.today().replace(year=2010) - date = date.strftime("%b %-d, %Y") - device.wait_for_text(str(date)) + device.wait_for_text("testMessage") From 560185a9b6709f859c25a087864fb01df129f233 Mon Sep 17 00:00:00 2001 From: Zdravko Branzov Date: Tue, 19 Nov 2019 09:18:05 +0200 Subject: [PATCH 2/2] fix: flake8 error --- data/changes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/changes.py b/data/changes.py index 0826b3e0..9503cfe6 100644 --- a/data/changes.py +++ b/data/changes.py @@ -208,7 +208,7 @@ class DateTimePicker(object): new_value='this.nativeView.setFocusable(false); this.hint = "testMessage";') IOS_TS = ChangeSet(file_path=os.path.join(DATETIME_PICKER_PATH, 'ui', 'date-picker-field.ios.ts'), old_value='export class DatePickerField extends DatePickerFieldBase {', - new_value='export class DatePickerField extends DatePickerFieldBase {initNativeView() {this.hint = "testMessage";}') + new_value='export class DatePickerField extends DatePickerFieldBase {initNativeView() {this.hint = "testMessage";}') # noqa: E501 pylint: disable=line-too-long class AppFileChanges(object): CHANGE_XML_INVALID_SYNTAX = ChangeSet(file_path=os.path.join('app', 'main-page.xml'),