From 27c3f0d7661339b37b4331be6cd92eb31765ce9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Wed, 28 May 2025 08:33:40 +0200 Subject: [PATCH] adapt E2E tests to be compatible with the new visual design --- ...provided_but_incorrect_dsl_not_needed.yaml | 6 ++-- ...t_a_domain_i.e.,_abcedf_u3_not_needed.yaml | 6 ++-- ...a_domain_i.e.,_abcedf__dsl_not_needed.yaml | 6 ++-- ...www.search-company-site_u3_not_needed.yaml | 6 ++-- ...w.search-company-site__dsl_not_needed.yaml | 6 ++-- ..._domain_param_u3_param_included_1_1_1.yaml | 6 ++-- ...d_domain_param_dsl_param_included_1_1.yaml | 6 ++-- ...omain_param,_but_missing_u3_param_1_1.yaml | 6 ++-- ...main_param,_but_missing_dsl_param_1_1.yaml | 6 ++-- ...ain_provided,_but_empty_u3_not_needed.yaml | 6 ++-- ...in_provided,_but_empty_dsl_not_needed.yaml | 3 +- ...ided_ad_domain_provided_u3_not_needed.yaml | 6 ++-- ...ded_ad_domain_provided_dsl_not_needed.yaml | 6 ++-- ..._provided_but_incorrect_u3_not_needed.yaml | 6 ++-- .../1-_design-system-components.yaml | 4 +-- .maestro/app_tp/app_tp_onboarding.yaml | 3 +- .../1_autofill_shown_in_overflow.yaml | 1 - ...tofill_add_search_update_delete_creds.yaml | 1 - ...tofill_prompted_to_save_creds_on_form.yaml | 1 - .../autofill/4_autofill_settings_creds.yaml | 4 +-- .../steps/access_passwords_screen.yaml | 3 +- ...re_bookmarks_can_be_added_and_deleted.yaml | 6 ++-- .../open_bookmark_and_navigate_back.yaml | 6 ++-- ..._bookmark_in_folder_and_navigate_back.yaml | 6 ++-- .../custom_tabs/custom_tabs_navigation.yaml | 4 +-- .../custom_tabs_navigation_new_tab.yaml | 4 +-- .../favorites/favorites_bookmarks_add.yaml | 6 ++-- .../favorites/favorites_bookmarks_delete.yaml | 9 ++--- .../fire_button/fire_during_onboarding.yaml | 6 ++-- .../1_-_permissions_allowed.yaml | 3 +- .../2_-_permissions_denied.yaml | 3 +- .../onboarding_dismiss_all_dialogs.yaml | 3 +- .../1_-_Single-site,_single-tab,_session.yaml | 9 ++--- .../2_-_Single-site,_new-tab,_session.yaml | 9 ++--- ...le-site,_new-tab,_session_variant_two.yaml | 9 ++--- .../4_-_Single-site,_multi-tab_session.yaml | 6 ++-- .../5_-_Multi-site,_single-tab,_session.yaml | 9 ++--- .maestro/privacy_tests/6_-_Multi-tab.yaml | 6 ++-- .../7_-_Browser_restart_mid-session.yaml | 9 ++--- .../8_-_Navigation_with_back_forward.yaml | 9 ++--- .../9_-_Navigation_with_refresh.yaml | 9 ++--- .../browser_screen/click_on_fire_button.yaml | 13 +++++++ .../browser_screen/click_on_menu_button.yaml | 13 +++++++ .../click_on_privacy_shield.yaml | 36 +++++++++++++++++++ .../browser_screen/click_on_tabs_button.yaml | 13 +++++++ .maestro/shared/open_bookmarks.yaml | 3 +- .../shared/open_sync_dev_settings_screen.yaml | 4 +-- .maestro/shared/open_sync_screen.yaml | 4 +-- .../action_add_bookmarks_and_folders.yaml | 6 ++-- .maestro/tabs/open_multiple_tabs.yaml | 9 ++--- app/src/main/res/layout/view_fade_omnibar.xml | 1 + 51 files changed, 158 insertions(+), 173 deletions(-) create mode 100644 .maestro/shared/browser_screen/click_on_fire_button.yaml create mode 100644 .maestro/shared/browser_screen/click_on_menu_button.yaml create mode 100644 .maestro/shared/browser_screen/click_on_privacy_shield.yaml create mode 100644 .maestro/shared/browser_screen/click_on_tabs_button.yaml 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 19228abc93c1..d915511d22f2 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-10" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-10" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 83fd9d35fe8b..6739aac6b068 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-11" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-11" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 651a93a71b24..ea57d057ce30 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-12" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-12" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 0b15f0abf7fc..72af1c250f9b 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-13" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-13" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 e13a92d3873e..b29f0060fe2d 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-14" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-14" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 d379411c45bf..1165727b2a11 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-1" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-1" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 81a7a9e3dbfe..2214d51f1f07 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-2" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-2" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 b6da62d4ad45..f8498bf625e0 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-3" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-3" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 cafa0f4c0a3f..df397463b17e 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-4" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-4" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 1e188c5745f4..3391a65c17fc 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 503a67fa9d81..4d9c81d43ecc 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 @@ -18,8 +18,7 @@ tags: id: "ad-id-6" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 8264ba0986bf..6ca664517d5e 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 @@ -13,8 +13,7 @@ tags: - 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 - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-7" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 f11e7f76fd98..902fe4048dc0 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-8" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-8" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 17876b7a56c3..bc0df022a42e 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 @@ -13,8 +13,7 @@ tags: - inputText: "https://www.search-company.site/#ad-id-9" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconMenu" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: text: "Cancel" - assertVisible: @@ -23,8 +22,7 @@ tags: id: "ad-id-9" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: diff --git a/.maestro/ads_preview_flows/1-_design-system-components.yaml b/.maestro/ads_preview_flows/1-_design-system-components.yaml index ba21ab3fafb0..2e09a28fef97 100644 --- a/.maestro/ads_preview_flows/1-_design-system-components.yaml +++ b/.maestro/ads_preview_flows/1-_design-system-components.yaml @@ -11,9 +11,7 @@ tags: - runFlow: ../shared/skip_all_onboarding.yaml - - hideKeyboard - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "Settings" index: 0 diff --git a/.maestro/app_tp/app_tp_onboarding.yaml b/.maestro/app_tp/app_tp_onboarding.yaml index def5e4fd8be6..55f24b3167f4 100644 --- a/.maestro/app_tp/app_tp_onboarding.yaml +++ b/.maestro/app_tp/app_tp_onboarding.yaml @@ -12,8 +12,7 @@ tags: - runFlow: ../shared/skip_all_onboarding.yaml - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "Settings" index: 0 diff --git a/.maestro/autofill/1_autofill_shown_in_overflow.yaml b/.maestro/autofill/1_autofill_shown_in_overflow.yaml index a2fd4c38502f..4599cb3b6b58 100644 --- a/.maestro/autofill/1_autofill_shown_in_overflow.yaml +++ b/.maestro/autofill/1_autofill_shown_in_overflow.yaml @@ -11,5 +11,4 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml - - hideKeyboard - 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 08d8f67397f9..1b6227c4a544 100644 --- a/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml +++ b/.maestro/autofill/2_autofill_add_search_update_delete_creds.yaml @@ -10,7 +10,6 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml - - hideKeyboard - 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 f359f2670c80..b89e81b60032 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 @@ -10,7 +10,6 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml - - hideKeyboard - tapOn: id: "omnibarTextInput" diff --git a/.maestro/autofill/4_autofill_settings_creds.yaml b/.maestro/autofill/4_autofill_settings_creds.yaml index e6b345c3f489..649f5c8a1a4c 100644 --- a/.maestro/autofill/4_autofill_settings_creds.yaml +++ b/.maestro/autofill/4_autofill_settings_creds.yaml @@ -10,10 +10,8 @@ tags: - launchApp: clearState: true - runFlow: ../shared/skip_all_onboarding.yaml - - hideKeyboard - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: "Settings" - tapOn: "Settings" diff --git a/.maestro/autofill/steps/access_passwords_screen.yaml b/.maestro/autofill/steps/access_passwords_screen.yaml index 5a5544a6ce0c..ff46611be095 100644 --- a/.maestro/autofill/steps/access_passwords_screen.yaml +++ b/.maestro/autofill/steps/access_passwords_screen.yaml @@ -3,7 +3,6 @@ name: "Autofill: Autofill screen is reachable from overflow menu" --- # Pre-requisite: the user has cleared onboarding and is on the new tab page -- tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" +- runFlow: ../../shared/browser_screen/click_on_menu_button.yaml - assertVisible: "Passwords" - tapOn: "Passwords" \ No newline at end of file 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 3f134e1ef2cc..f58136766914 100644 --- a/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml +++ b/.maestro/bookmarks/ensure_bookmarks_can_be_added_and_deleted.yaml @@ -16,14 +16,12 @@ tags: id: "omnibarTextInput" - inputText: "https://privacy-test-pages.site" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "add bookmark" - tapOn: text: "add bookmark" - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "bookmarks" - tapOn: diff --git a/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml b/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml index 2d539bcc9219..1dda7a8550de 100644 --- a/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml +++ b/.maestro/bookmarks/open_bookmark_and_navigate_back.yaml @@ -24,14 +24,12 @@ tags: - pressKey: Enter - assertVisible: text: "Privacy Test Pages" - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "add bookmark" - tapOn: text: "add bookmark" - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "bookmarks" - tapOn: 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 e85dae54d78a..c2de782a316c 100644 --- a/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml +++ b/.maestro/bookmarks/open_bookmark_in_folder_and_navigate_back.yaml @@ -18,8 +18,7 @@ tags: - pressKey: Enter - assertVisible: text: "Privacy Test Pages" - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "add bookmark" - tapOn: @@ -30,8 +29,7 @@ tags: - pressKey: Enter - assertVisible: text: "Search engine" - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "bookmarks" - tapOn: diff --git a/.maestro/custom_tabs/custom_tabs_navigation.yaml b/.maestro/custom_tabs/custom_tabs_navigation.yaml index 2e818abc89d7..250dc65994e8 100644 --- a/.maestro/custom_tabs/custom_tabs_navigation.yaml +++ b/.maestro/custom_tabs/custom_tabs_navigation.yaml @@ -27,9 +27,7 @@ tags: - tapOn: "next" - assertVisible: text: ".*Try a search!.*" - - hideKeyboard - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "settings" - scrollUntilVisible: diff --git a/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml b/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml index 519dd1e45b16..4a8b68fc9a71 100644 --- a/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml +++ b/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml @@ -27,9 +27,7 @@ tags: - tapOn: "next" - assertVisible: text: ".*Try a search!.*" - - hideKeyboard - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "settings" - scrollUntilVisible: diff --git a/.maestro/favorites/favorites_bookmarks_add.yaml b/.maestro/favorites/favorites_bookmarks_add.yaml index 19be08760c63..e137ccca231f 100644 --- a/.maestro/favorites/favorites_bookmarks_add.yaml +++ b/.maestro/favorites/favorites_bookmarks_add.yaml @@ -16,13 +16,11 @@ tags: id: "omnibarTextInput" - inputText: "https://privacy-test-pages.site" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "add bookmark" # Navigate to bookmarks screen - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "bookmarks" # Add favorite from bookmarks screen diff --git a/.maestro/favorites/favorites_bookmarks_delete.yaml b/.maestro/favorites/favorites_bookmarks_delete.yaml index b65065f66f14..d0d1ee0b1425 100644 --- a/.maestro/favorites/favorites_bookmarks_delete.yaml +++ b/.maestro/favorites/favorites_bookmarks_delete.yaml @@ -16,15 +16,13 @@ tags: id: "omnibarTextInput" - inputText: "https://privacy-test-pages.site" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "add bookmark" - tapOn: text: "add bookmark" # Add favorite from edit saved site - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "edit bookmark" - tapOn: @@ -35,8 +33,7 @@ tags: text: "add to favorites" - tapOn: id: "com.duckduckgo.mobile.android:id/action_confirm_changes" - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - assertVisible: text: "bookmarks" - tapOn: diff --git a/.maestro/fire_button/fire_during_onboarding.yaml b/.maestro/fire_button/fire_during_onboarding.yaml index 4d5d94ccd185..033ef23669ec 100644 --- a/.maestro/fire_button/fire_during_onboarding.yaml +++ b/.maestro/fire_button/fire_during_onboarding.yaml @@ -22,11 +22,9 @@ tags: text: "got it" - assertVisible: text: ".*browsing activity with the fire button.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconImageView" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: "Cancel" - assertNotVisible: ".*browsing activity with the Fire Button.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/fireIconImageView" + - runFlow: ../shared/browser_screen/click_on_fire_button.yaml - tapOn: "Clear All Tabs And Data" - assertVisible: "You've got this!.*" \ No newline at end of file diff --git a/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml b/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml index dc623016aca5..dbf99f7f4439 100644 --- a/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml +++ b/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml @@ -15,8 +15,7 @@ tags: - runFlow: ../shared/skip_all_onboarding.yaml - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "Downloads" - assertVisible: diff --git a/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml b/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml index 8a8a7643b26f..d628a865cd77 100644 --- a/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml +++ b/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml @@ -15,8 +15,7 @@ tags: - runFlow: ../shared/skip_all_onboarding.yaml - - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + - runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: text: "Downloads" - assertVisible: diff --git a/.maestro/onboarding/onboarding_dismiss_all_dialogs.yaml b/.maestro/onboarding/onboarding_dismiss_all_dialogs.yaml index 7821bd3c02a1..ce0d65b8d1f9 100644 --- a/.maestro/onboarding/onboarding_dismiss_all_dialogs.yaml +++ b/.maestro/onboarding/onboarding_dismiss_all_dialogs.yaml @@ -51,8 +51,7 @@ tags: id: daxDialogDismissButton - assertNotVisible: text: ".*Remember: every time you browse with me a creepy ad loses its wings..*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/tabCount" + - runFlow: ../shared/browser_screen/click_on_tabs_button.yaml - tapOn: "New Tab" - assertVisible: text: ".*Try our search widget!.*" \ No newline at end of file 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 a299c2acdbca..1f114c007a79 100644 --- a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -57,8 +56,7 @@ tags: id: "buy-now" - assertVisible: text: "Checkout" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -96,8 +94,7 @@ tags: id: "pay-button" - assertVisible: text: ".*Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 60c5bea035cb..81d60805023c 100644 --- a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml +++ b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml @@ -20,8 +20,7 @@ tags: text: "Open in New Tab" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -61,8 +60,7 @@ tags: id: "buy-now" - assertVisible: text: "Checkout" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -100,8 +98,7 @@ tags: id: "pay-button" - assertVisible: text: ".*Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 dbc9aee5d81e..72793413dc00 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 @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -61,8 +60,7 @@ tags: text: "Open in New Tab" - assertVisible: text: "Checkout" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -100,8 +98,7 @@ tags: id: "pay-button" - assertVisible: text: ".*Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 e459767eba24..b6b7d263ca15 100644 --- a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml +++ b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -73,8 +72,7 @@ tags: id: "pay-button" - assertVisible: text: ".*Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: 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 f93f3ffddd58..66e8a41df5f6 100644 --- a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -73,8 +72,7 @@ tags: id: "payment-company" - assertVisible: text: "Pay First Party" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -108,8 +106,7 @@ tags: id: "pay-button" - assertVisible: text: "Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: diff --git a/.maestro/privacy_tests/6_-_Multi-tab.yaml b/.maestro/privacy_tests/6_-_Multi-tab.yaml index 6810dc2e420e..45677befe007 100644 --- a/.maestro/privacy_tests/6_-_Multi-tab.yaml +++ b/.maestro/privacy_tests/6_-_Multi-tab.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -81,8 +80,7 @@ tags: id: "pay-button" - assertVisible: text: ".*Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: diff --git a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml index a59ab42094bb..956e5b5f0a7f 100644 --- a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml +++ b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -59,8 +58,7 @@ tags: id: "buy-now" - assertVisible: text: "Pay" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -103,8 +101,7 @@ tags: id: "pay-button" - assertVisible: text: ".*Order complete.*" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: diff --git a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml index c7342ab31d58..60bc2da78725 100644 --- a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml +++ b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -73,8 +72,7 @@ tags: id: "payment-company" - assertVisible: text: "Pay First Party" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -138,8 +136,7 @@ tags: id: "pay-button" - tapOn: id: "pay-button" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: diff --git a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml index a1804711d1ed..f53e6284ae8e 100644 --- a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml +++ b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml @@ -16,8 +16,7 @@ tags: id: "ad-id-5" - assertVisible: text: "Publisher site" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -73,8 +72,7 @@ tags: id: "payment-company" - assertVisible: text: "Pay First Party" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: @@ -114,8 +112,7 @@ tags: id: "pay-button" - tapOn: id: "pay-button" - - tapOn: - id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + - runFlow: ../shared/browser_screen/click_on_privacy_shield.yaml - assertVisible: text: "View Tracker Companies" - tapOn: diff --git a/.maestro/shared/browser_screen/click_on_fire_button.yaml b/.maestro/shared/browser_screen/click_on_fire_button.yaml new file mode 100644 index 000000000000..a66c9c04d5d2 --- /dev/null +++ b/.maestro/shared/browser_screen/click_on_fire_button.yaml @@ -0,0 +1,13 @@ +appId: com.duckduckgo.mobile.android +--- +- runFlow: + when: + notVisible: + id: 'com.duckduckgo.mobile.android:id/fireIconImageView' + commands: + - hideKeyboard + - assertVisible: + id: 'com.duckduckgo.mobile.android:id/fireIconImageView' + +- tapOn: + id: 'com.duckduckgo.mobile.android:id/fireIconImageView' \ No newline at end of file diff --git a/.maestro/shared/browser_screen/click_on_menu_button.yaml b/.maestro/shared/browser_screen/click_on_menu_button.yaml new file mode 100644 index 000000000000..e5cda6b51426 --- /dev/null +++ b/.maestro/shared/browser_screen/click_on_menu_button.yaml @@ -0,0 +1,13 @@ +appId: com.duckduckgo.mobile.android +--- +- runFlow: + when: + notVisible: + id: 'com.duckduckgo.mobile.android:id/browserMenuImageView' + commands: + - hideKeyboard + - assertVisible: + id: 'com.duckduckgo.mobile.android:id/browserMenuImageView' + +- tapOn: + id: 'com.duckduckgo.mobile.android:id/browserMenuImageView' \ No newline at end of file diff --git a/.maestro/shared/browser_screen/click_on_privacy_shield.yaml b/.maestro/shared/browser_screen/click_on_privacy_shield.yaml new file mode 100644 index 000000000000..5786af8558a7 --- /dev/null +++ b/.maestro/shared/browser_screen/click_on_privacy_shield.yaml @@ -0,0 +1,36 @@ +appId: com.duckduckgo.mobile.android +--- + +# This flow opens the Privacy Dashboard from the Omnibar. +# +# Unfortunately, we can't click the privacy shield directly because the shield is a Lottie animation view which extends beyond the bounds of the text input field. +# Trying to click it directly will result in a tap on the text input field instead. +# +# I tried using the "point" and "leftOf" selector features to click the shield directly, the former is a known issue (https://github.com/mobile-dev-inc/Maestro/issues/1421) +# and trying to click to the left of the input text field didn't work for me either. +# +# To work around this, when view_new_omnibar is used, we tap on the Omnibar icon container +# which aligns with the shield and has a non-zero size because of an invisible pulse animation placeholder that's within it. +# That shield animation placeholder is in a different place for the view_fade_omnibar, so we're using a conditional flow to handle both cases. + +# flow for view_new_omnibar +- runFlow: + when: + notVisible: + id: "com.duckduckgo.mobile.android:id/shieldIconPulseAnimationContainer" + commands: + - assertVisible: + id: "com.duckduckgo.mobile.android:id/shieldIcon" + - tapOn: + id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" + +# flow for view_fade_omnibar +- runFlow: + when: + visible: + id: "com.duckduckgo.mobile.android:id/shieldIconPulseAnimationContainer" + commands: + - assertVisible: + id: "com.duckduckgo.mobile.android:id/shieldIconExperiment" + - tapOn: + id: "com.duckduckgo.mobile.android:id/shieldIconPulseAnimationContainer" \ No newline at end of file diff --git a/.maestro/shared/browser_screen/click_on_tabs_button.yaml b/.maestro/shared/browser_screen/click_on_tabs_button.yaml new file mode 100644 index 000000000000..fe26d4cae385 --- /dev/null +++ b/.maestro/shared/browser_screen/click_on_tabs_button.yaml @@ -0,0 +1,13 @@ +appId: com.duckduckgo.mobile.android +--- +- runFlow: + when: + notVisible: + id: 'com.duckduckgo.mobile.android:id/tabCount' + commands: + - hideKeyboard + - assertVisible: + id: 'com.duckduckgo.mobile.android:id/tabCount' + +- tapOn: + id: 'com.duckduckgo.mobile.android:id/tabCount' \ No newline at end of file diff --git a/.maestro/shared/open_bookmarks.yaml b/.maestro/shared/open_bookmarks.yaml index caa8122c092d..0e7095d9d451 100644 --- a/.maestro/shared/open_bookmarks.yaml +++ b/.maestro/shared/open_bookmarks.yaml @@ -1,8 +1,7 @@ appId: com.duckduckgo.mobile.android --- - hideKeyboard -- tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" +- runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: "Bookmarks" - runFlow: when: diff --git a/.maestro/shared/open_sync_dev_settings_screen.yaml b/.maestro/shared/open_sync_dev_settings_screen.yaml index 9454fe72513c..1f02853d884e 100644 --- a/.maestro/shared/open_sync_dev_settings_screen.yaml +++ b/.maestro/shared/open_sync_dev_settings_screen.yaml @@ -1,8 +1,6 @@ appId: com.duckduckgo.mobile.android --- -- hideKeyboard -- tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" +- runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: "Settings" - scrollUntilVisible: element: "Sync Dev Settings" diff --git a/.maestro/shared/open_sync_screen.yaml b/.maestro/shared/open_sync_screen.yaml index a437c5a2066a..917ff1108175 100644 --- a/.maestro/shared/open_sync_screen.yaml +++ b/.maestro/shared/open_sync_screen.yaml @@ -1,7 +1,5 @@ appId: com.duckduckgo.mobile.android --- -- hideKeyboard -- tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" +- runFlow: ../shared/browser_screen/click_on_menu_button.yaml - tapOn: "Settings" - tapOn: "Sync & Backup" \ No newline at end of file diff --git a/.maestro/sync_flows/steps/action_add_bookmarks_and_folders.yaml b/.maestro/sync_flows/steps/action_add_bookmarks_and_folders.yaml index 07fa38452d5e..ae481065e3c0 100644 --- a/.maestro/sync_flows/steps/action_add_bookmarks_and_folders.yaml +++ b/.maestro/sync_flows/steps/action_add_bookmarks_and_folders.yaml @@ -23,16 +23,14 @@ appId: com.duckduckgo.mobile.android commands: - tapOn: id: "com.duckduckgo.mobile.android:id/primaryCta" -- tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" +- runFlow: ../../shared/browser_screen/click_on_menu_button.yaml - tapOn: "Add Bookmark" - tapOn: id: "omnibarTextInput" # Now, we add a favourite - inputText: "${output.bookmarks.domains[1]}" - pressKey: Enter -- tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" +- runFlow: ../../shared/browser_screen/click_on_menu_button.yaml - tapOn: "Add Bookmark" - tapOn: id: "com.duckduckgo.mobile.android:id/bookmarksBottomSheetSwitch" diff --git a/.maestro/tabs/open_multiple_tabs.yaml b/.maestro/tabs/open_multiple_tabs.yaml index 7f4e8b133515..b3fd54f742aa 100644 --- a/.maestro/tabs/open_multiple_tabs.yaml +++ b/.maestro/tabs/open_multiple_tabs.yaml @@ -16,8 +16,7 @@ tags: id: "omnibarTextInput" - inputText: "https://privacy-test-pages.site" - pressKey: Enter - - tapOn: - id: "com.duckduckgo.mobile.android:id/tabCount" + - runFlow: ../shared/browser_screen/click_on_tabs_button.yaml - assertVisible: text: "Privacy Test Pages - Home" - tapOn: "New Tab" @@ -27,8 +26,7 @@ tags: - pressKey: Enter - assertVisible: text: "Search engine" - - tapOn: - id: "com.duckduckgo.mobile.android:id/tabCount" + - runFlow: ../shared/browser_screen/click_on_tabs_button.yaml - assertVisible: text: "Ad Click Flow" - assertVisible: @@ -39,8 +37,7 @@ tags: text: "Ad Click Flow" - assertVisible: text: "Privacy Test Pages - Home" - - tapOn: - id: "com.duckduckgo.mobile.android:id/tabCount" + - runFlow: ../shared/browser_screen/click_on_tabs_button.yaml - assertVisible: text: "Ad Click Flow" - tapOn: diff --git a/app/src/main/res/layout/view_fade_omnibar.xml b/app/src/main/res/layout/view_fade_omnibar.xml index 597e01dc049b..c894c7bb5424 100644 --- a/app/src/main/res/layout/view_fade_omnibar.xml +++ b/app/src/main/res/layout/view_fade_omnibar.xml @@ -343,6 +343,7 @@