diff --git a/.maestro/ad_click_detection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml b/.maestro/ad_click_detection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml index cb0e79f2de99..5bcf0c572da7 100644 --- a/.maestro/ad_click_detection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-10" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/11_-_y.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml b/.maestro/ad_click_detection_flows/11_-_y.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml index 33efbc4e6727..48997562fdee 100644 --- a/.maestro/ad_click_detection_flows/11_-_y.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/11_-_y.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf_u3_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-11" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/12_-_m.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf__dsl_not_needed.yaml b/.maestro/ad_click_detection_flows/12_-_m.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf__dsl_not_needed.yaml index 95d9d6139c18..045ebc4c6ad3 100644 --- a/.maestro/ad_click_detection_flows/12_-_m.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf__dsl_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/12_-_m.js_bing-provided_ad_domain_provided_but_it's_not_a_domain_i.e.,_abcedf__dsl_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-12" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/13_-_y.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site_u3_not_needed.yaml b/.maestro/ad_click_detection_flows/13_-_y.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site_u3_not_needed.yaml index cf21f49c401f..451aa33000bc 100644 --- a/.maestro/ad_click_detection_flows/13_-_y.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site_u3_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/13_-_y.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site_u3_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-13" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/14_-_m.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site__dsl_not_needed.yaml b/.maestro/ad_click_detection_flows/14_-_m.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site__dsl_not_needed.yaml index dfa5df986a72..ee27560d19cd 100644 --- a/.maestro/ad_click_detection_flows/14_-_m.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site__dsl_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/14_-_m.js_bing-provided_ad_domain_provided_but_it's_a_subdomain_of_advertiser_i.e.,_foo.www.search-company-site__dsl_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-14" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/1_-_y.js_heuristic_no_ad_domain_param_u3_param_included_1_1_1.yaml b/.maestro/ad_click_detection_flows/1_-_y.js_heuristic_no_ad_domain_param_u3_param_included_1_1_1.yaml index c38ee91dd4cc..c7f34e7f3051 100644 --- a/.maestro/ad_click_detection_flows/1_-_y.js_heuristic_no_ad_domain_param_u3_param_included_1_1_1.yaml +++ b/.maestro/ad_click_detection_flows/1_-_y.js_heuristic_no_ad_domain_param_u3_param_included_1_1_1.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-1" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/2_-_m.js_heuristic_no_ad_domain_param_dsl_param_included_1_1.yaml b/.maestro/ad_click_detection_flows/2_-_m.js_heuristic_no_ad_domain_param_dsl_param_included_1_1.yaml index f32051b9268c..5f88f7e08dda 100644 --- a/.maestro/ad_click_detection_flows/2_-_m.js_heuristic_no_ad_domain_param_dsl_param_included_1_1.yaml +++ b/.maestro/ad_click_detection_flows/2_-_m.js_heuristic_no_ad_domain_param_dsl_param_included_1_1.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-2" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/3_-_y.js_heuristic_no_ad_domain_param,_but_missing_u3_param_1_1.yaml b/.maestro/ad_click_detection_flows/3_-_y.js_heuristic_no_ad_domain_param,_but_missing_u3_param_1_1.yaml index 3d0be79cf9b5..846f58ad6c42 100644 --- a/.maestro/ad_click_detection_flows/3_-_y.js_heuristic_no_ad_domain_param,_but_missing_u3_param_1_1.yaml +++ b/.maestro/ad_click_detection_flows/3_-_y.js_heuristic_no_ad_domain_param,_but_missing_u3_param_1_1.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-3" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/4_-_m.js_heuristic_no_ad_domain_param,_but_missing_dsl_param_1_1.yaml b/.maestro/ad_click_detection_flows/4_-_m.js_heuristic_no_ad_domain_param,_but_missing_dsl_param_1_1.yaml index d6e19718ee4c..45454abbb2b7 100644 --- a/.maestro/ad_click_detection_flows/4_-_m.js_heuristic_no_ad_domain_param,_but_missing_dsl_param_1_1.yaml +++ b/.maestro/ad_click_detection_flows/4_-_m.js_heuristic_no_ad_domain_param,_but_missing_dsl_param_1_1.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-4" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/5_-_y.js_heuristic_ad_domain_provided,_but_empty_u3_not_needed.yaml b/.maestro/ad_click_detection_flows/5_-_y.js_heuristic_ad_domain_provided,_but_empty_u3_not_needed.yaml index 43f8f43188da..e4d29167a316 100644 --- a/.maestro/ad_click_detection_flows/5_-_y.js_heuristic_ad_domain_provided,_but_empty_u3_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/5_-_y.js_heuristic_ad_domain_provided,_but_empty_u3_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/6_-_m.js_heuristic_ad_domain_provided,_but_empty_dsl_not_needed.yaml b/.maestro/ad_click_detection_flows/6_-_m.js_heuristic_ad_domain_provided,_but_empty_dsl_not_needed.yaml index b84448c86de7..1da710c7561a 100644 --- a/.maestro/ad_click_detection_flows/6_-_m.js_heuristic_ad_domain_provided,_but_empty_dsl_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/6_-_m.js_heuristic_ad_domain_provided,_but_empty_dsl_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-6" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/7_-_y.js_bing-provided_ad_domain_provided_u3_not_needed.yaml b/.maestro/ad_click_detection_flows/7_-_y.js_bing-provided_ad_domain_provided_u3_not_needed.yaml index 44a7c74c6ad1..9b4fc7b64a2c 100644 --- a/.maestro/ad_click_detection_flows/7_-_y.js_bing-provided_ad_domain_provided_u3_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/7_-_y.js_bing-provided_ad_domain_provided_u3_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-6" # scroll until the ad-id-6 instead of ad-id-7 (context: https://app.asana.com/0/0/1204397066248823/1204415854211764/f) - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/8_-_m.js_bing-provided_ad_domain_provided_dsl_not_needed.yaml b/.maestro/ad_click_detection_flows/8_-_m.js_bing-provided_ad_domain_provided_dsl_not_needed.yaml index 724700b496f9..19f7132e1aa6 100644 --- a/.maestro/ad_click_detection_flows/8_-_m.js_bing-provided_ad_domain_provided_dsl_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/8_-_m.js_bing-provided_ad_domain_provided_dsl_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-8" - pressKey: Enter diff --git a/.maestro/ad_click_detection_flows/9_-_y.js_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml b/.maestro/ad_click_detection_flows/9_-_y.js_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml index 8da49e6da542..7977812ac252 100644 --- a/.maestro/ad_click_detection_flows/9_-_y.js_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml +++ b/.maestro/ad_click_detection_flows/9_-_y.js_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml @@ -8,7 +8,7 @@ tags: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-9" - pressKey: Enter diff --git a/.maestro/ads_preview_flows/1-_design-system-components.yaml b/.maestro/ads_preview_flows/1-_design-system-components.yaml index 5faa957ba60b..6b388cb17d88 100644 --- a/.maestro/ads_preview_flows/1-_design-system-components.yaml +++ b/.maestro/ads_preview_flows/1-_design-system-components.yaml @@ -9,7 +9,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: id: "com.duckduckgo.mobile.android:id/browserMenuImageView" diff --git a/.maestro/app_tp/app_tp_onboarding.yaml b/.maestro/app_tp/app_tp_onboarding.yaml index bf75922eaa54..def5e4fd8be6 100644 --- a/.maestro/app_tp/app_tp_onboarding.yaml +++ b/.maestro/app_tp/app_tp_onboarding.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: id: "com.duckduckgo.mobile.android:id/browserMenuImageView" diff --git a/.maestro/autofill/1_autofill_shown_in_overflow.yaml b/.maestro/autofill/1_autofill_shown_in_overflow.yaml index 94182dd977d7..3bee29eda083 100644 --- a/.maestro/autofill/1_autofill_shown_in_overflow.yaml +++ b/.maestro/autofill/1_autofill_shown_in_overflow.yaml @@ -2,13 +2,14 @@ appId: com.duckduckgo.mobile.android name: "Autofill: Autofill screen is reachable from overflow menu" tags: - autofillNoAuthTests + - x --- # Pre-requisite: None (can be run whether auth is required or not) - retry: - maxRetries: 3 + maxRetries: 0 commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - runFlow: steps/access_passwords_screen.yaml \ No newline at end of file diff --git a/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml b/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml index c038205c6b8d..f8debcaacadf 100644 --- a/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml +++ b/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml @@ -9,7 +9,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - runFlow: steps/access_passwords_screen.yaml - assertVisible: diff --git a/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml b/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml index d04c51098e22..934209a72f5d 100644 --- a/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml +++ b/.maestro/autofill/3_autofill_prompted_to_save_creds_on_form.yaml @@ -9,7 +9,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: id: "omnibarTextInput" diff --git a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml index 815b6bb66ea6..88ea8c215bbd 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml index 9e486e60f6da..0dc67df61107 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_login_username_backfilled_for_an_update.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # setup an existing credential - runFlow: ../steps/manually_add_existing_credential.yaml diff --git a/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml b/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml index f4652c6da059..9c37924261e6 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_login_username_not_backfilled_if_provided_explicitly.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml index 1368cd93e55c..ab9710b7412f 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_autogenerated.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml index 8d5639af2de0..a7b0696a0b1e 100644 --- a/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml +++ b/.maestro/autofill/backfillingUsername/multi_step_registration_username_backfilled_password_manually_entered.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml b/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml index ae985f8dcc2a..a53858df276c 100644 --- a/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml +++ b/.maestro/autofill/backfillingUsername/password_reset_flow_autogenerated_password.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill login form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml index 45a5cdc752c6..033be1b74d99 100644 --- a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml +++ b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_generated_password.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill login form - tapOn: diff --git a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml index 6d992e6e3f26..6ce357c9054d 100644 --- a/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml +++ b/.maestro/autofill/backfillingUsername/password_reset_flow_for_existing_credential_manual_password.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # manually add a credential - runFlow: ../steps/manually_add_existing_credential.yaml diff --git a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml index 7c7a34c0bce7..d83a398bc446 100644 --- a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml +++ b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_with_username.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill form - tapOn: diff --git a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml index 53d348a669c6..19d0b7ebcc33 100644 --- a/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml +++ b/.maestro/autofill/passwordGeneration/autosaves_credential_when_password_generated_without_username.yaml @@ -11,7 +11,7 @@ tags: - launchApp: clearState: true - - runFlow: ../../shared/pre_onboarding.yaml + - runFlow: ../../shared/skip_all_onboarding.yaml # get to autofill form - tapOn: diff --git a/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml b/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml index 0e0a8dd3897b..a51b54e6df4a 100644 --- a/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml +++ b/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL" diff --git a/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml b/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml index bed26c64f522..806955a708fb 100644 --- a/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml +++ b/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL" diff --git a/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml b/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml index 5e3d45f9a4f8..add0f6583ebb 100644 --- a/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml +++ b/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL" diff --git a/.maestro/browsing/visit_site.yaml b/.maestro/browsing/visit_site.yaml index a811ec5469b0..fc23cbff09e0 100644 --- a/.maestro/browsing/visit_site.yaml +++ b/.maestro/browsing/visit_site.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL" diff --git a/.maestro/favorites/favorites_bookmarks_add.yaml b/.maestro/favorites/favorites_bookmarks_add.yaml index cd3076c3bf45..672d91e32f97 100644 --- a/.maestro/favorites/favorites_bookmarks_add.yaml +++ b/.maestro/favorites/favorites_bookmarks_add.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL" diff --git a/.maestro/favorites/favorites_bookmarks_delete.yaml b/.maestro/favorites/favorites_bookmarks_delete.yaml index 6dc48cf5a1a5..250cb219fe98 100644 --- a/.maestro/favorites/favorites_bookmarks_delete.yaml +++ b/.maestro/favorites/favorites_bookmarks_delete.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL" diff --git a/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml b/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml index aeec145c6433..438050e5767e 100644 --- a/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml +++ b/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml b/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml index a67f874a07e3..1528913a9c46 100644 --- a/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml +++ b/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml b/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml index 880da5a5b9eb..80e526a484b8 100644 --- a/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml +++ b/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml b/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml index 5a785edcf79c..f38b9f6e1694 100644 --- a/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml +++ b/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://privacy-test-pages.site/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml index 09d7d9f60629..e306b7b31999 100644 --- a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml index 77afba1d78a1..0733af1536f3 100644 --- a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml +++ b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml b/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml index 953f95b93846..e070414a3696 100644 --- a/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml +++ b/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml index 48c9cd42ba42..af5c86b27dce 100644 --- a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml +++ b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml index 6bd7192ae423..8544739aa716 100644 --- a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/6_-_Multi-tab.yaml b/.maestro/privacy_tests/6_-_Multi-tab.yaml index 7e9a5ebf5564..84dde544fff3 100644 --- a/.maestro/privacy_tests/6_-_Multi-tab.yaml +++ b/.maestro/privacy_tests/6_-_Multi-tab.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml index 7362427da69d..7e5d3ab66273 100644 --- a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml +++ b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml index 2bd094d0efe6..a9dbad75129d 100644 --- a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml +++ b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml index 4045214334b1..42ecd69114e4 100644 --- a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml +++ b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/security_tests/1_-_AddressBarSpoof,_basicauth.yaml b/.maestro/security_tests/1_-_AddressBarSpoof,_basicauth.yaml index 4365643c334a..aa986afc59bc 100644 --- a/.maestro/security_tests/1_-_AddressBarSpoof,_basicauth.yaml +++ b/.maestro/security_tests/1_-_AddressBarSpoof,_basicauth.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - doubleTapOn: id: "omnibarTextInput" - pressKey: Backspace diff --git a/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml b/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml index ad8e2b16f42d..f0017bf7fbf2 100644 --- a/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml +++ b/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - doubleTapOn: id: "omnibarTextInput" - inputText: "https://privacy-test-pages.site/security/address-bar-spoofing/spoof-about-blank-rewrite.html" diff --git a/.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml b/.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml index e55f6cff120b..6a4033412564 100644 --- a/.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml +++ b/.maestro/security_tests/3_-_AddressBarSpoof,_appschemes.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml # Test 1 - doubleTapOn: id: "omnibarTextInput" diff --git a/.maestro/security_tests/4_-_AddressBarSpoof,_b64_html.yaml b/.maestro/security_tests/4_-_AddressBarSpoof,_b64_html.yaml index 0d14db3f1650..7eab2e512c13 100644 --- a/.maestro/security_tests/4_-_AddressBarSpoof,_b64_html.yaml +++ b/.maestro/security_tests/4_-_AddressBarSpoof,_b64_html.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml # Test 1 - doubleTapOn: id: "omnibarTextInput" diff --git a/.maestro/security_tests/5_-_AddressBarSpoof,_downloadpath.yaml b/.maestro/security_tests/5_-_AddressBarSpoof,_downloadpath.yaml index 7521e740b9a9..5c80f7b344cc 100644 --- a/.maestro/security_tests/5_-_AddressBarSpoof,_downloadpath.yaml +++ b/.maestro/security_tests/5_-_AddressBarSpoof,_downloadpath.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml # Test 1 - doubleTapOn: id: "omnibarTextInput" diff --git a/.maestro/security_tests/6_-_AddressBarSpoof,_formaction.yaml b/.maestro/security_tests/6_-_AddressBarSpoof,_formaction.yaml index ee80e464b04f..dd0eb6bb70fd 100644 --- a/.maestro/security_tests/6_-_AddressBarSpoof,_formaction.yaml +++ b/.maestro/security_tests/6_-_AddressBarSpoof,_formaction.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml # Test 1 - doubleTapOn: id: "omnibarTextInput" diff --git a/.maestro/security_tests/7_-_AddressBarSpoof,_pagerewrite.yaml b/.maestro/security_tests/7_-_AddressBarSpoof,_pagerewrite.yaml index 82cc5ffb1e89..51582e15aac6 100644 --- a/.maestro/security_tests/7_-_AddressBarSpoof,_pagerewrite.yaml +++ b/.maestro/security_tests/7_-_AddressBarSpoof,_pagerewrite.yaml @@ -7,7 +7,7 @@ tags: commands: - launchApp: clearState: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml # Test 1 - doubleTapOn: id: "omnibarTextInput" diff --git a/.maestro/shared/onboarding_scripts/setup.js b/.maestro/shared/onboarding_scripts/setup.js new file mode 100644 index 000000000000..5db926b0d887 --- /dev/null +++ b/.maestro/shared/onboarding_scripts/setup.js @@ -0,0 +1,3 @@ +output.onboarding = { + runFullOnboarding: true +} \ No newline at end of file diff --git a/.maestro/shared/onboarding_scripts/skipped_onboarding.js b/.maestro/shared/onboarding_scripts/skipped_onboarding.js new file mode 100644 index 000000000000..8352bbf95959 --- /dev/null +++ b/.maestro/shared/onboarding_scripts/skipped_onboarding.js @@ -0,0 +1,3 @@ +output.onboarding = { + runFullOnboarding: false +} \ No newline at end of file diff --git a/.maestro/shared/skip_all_onboarding.yaml b/.maestro/shared/skip_all_onboarding.yaml new file mode 100644 index 000000000000..ae31ae5e66d1 --- /dev/null +++ b/.maestro/shared/skip_all_onboarding.yaml @@ -0,0 +1,23 @@ +appId: com.duckduckgo.mobile.android +--- +- runScript: onboarding_scripts/setup.js + +- extendedWaitUntil: + visible: "Skip Onboarding" + timeout: 10000 + optional: true + +- runFlow: + when: + visible: "Skip Onboarding" + commands: + - tapOn: "Skip Onboarding" + - runScript: onboarding_scripts/skipped_onboarding.js + +- runFlow: + when: + true: ${output.onboarding.runFullOnboarding} + commands: + - runFlow: pre_onboarding.yaml + + diff --git a/.maestro/tabs/open_multiple_tabs.yaml b/.maestro/tabs/open_multiple_tabs.yaml index f010a9b13103..4b1dae1b5303 100644 --- a/.maestro/tabs/open_multiple_tabs.yaml +++ b/.maestro/tabs/open_multiple_tabs.yaml @@ -10,7 +10,7 @@ tags: clearState: true stopApp: true - - runFlow: ../shared/pre_onboarding.yaml + - runFlow: ../shared/skip_all_onboarding.yaml - tapOn: text: "search or type URL"