From 2096b44807dbc2532155685c27f838abfe40a00e Mon Sep 17 00:00:00 2001 From: Noelia Alcala Date: Tue, 4 Jun 2024 00:08:05 +0100 Subject: [PATCH] Onboarding maestro tests updated (#4607) Task/Issue URL: https://app.asana.com/0/1201807753394693/1207385761777710/f ### Description Update maestro tests with new onboarding ### Steps to test this PR _[Optional]_ - [ ] Run maestro tests ### No UI changes --- ...ovided_but_incorrect_(dsl_not_needed).yaml | 10 +++++----- ...domain_(i.e.,_abcedf)_(u3_not_needed).yaml | 10 +++++----- ...main_(i.e.,_abcedf)__(dsl_not_needed).yaml | 10 +++++----- ....search-company-site)_(u3_not_needed).yaml | 10 +++++----- ...earch-company-site)__(dsl_not_needed).yaml | 10 +++++----- ...no_ad_domain_param;_u3_param_included.yaml | 12 ++++++------ ...o_ad_domain_param;_dsl_param_included.yaml | 10 +++++----- ...ad_domain_param,_but_missing_u3_param.yaml | 10 +++++----- ...d_domain_param,_but_missing_dsl_param.yaml | 10 +++++----- ...n_provided,_but_empty_(u3_not_needed).yaml | 10 +++++----- ..._provided,_but_empty_(dsl_not_needed).yaml | 8 +------- ...d;_ad_domain_provided_(u3_not_needed).yaml | 10 +++++----- ...;_ad_domain_provided_(dsl_not_needed).yaml | 10 +++++----- ...rovided_but_incorrect_(u3_not_needed).yaml | 10 +++++----- .../1-_design-system-components.yaml | 2 +- .../custom_tabs/custom_tabs_navigation.yaml | 8 ++++++-- .../custom_tabs_navigation_new_tab.yaml | 8 ++++++-- .../fire_button/fire_during_onboarding.yaml | 6 +++--- .../1_-_permissions_allowed.yaml | 11 +++++++---- .../2_-_permissions_denied.yaml | 19 +++++++++++-------- ...,_utm_source_and_1_standard_parameter.yaml | 6 ------ ...Parameters,_utm_source_and_utm_medium.yaml | 6 ------ ...d,_fb_source_and_1_standard_parameter.yaml | 6 ------ ...s,_link_which_should_not_be_rewritten.yaml | 6 ------ .../1_-_Single-site,_single-tab,_session.yaml | 6 ------ .../2_-_Single-site,_new-tab,_session.yaml | 6 ------ ...le-site,_new-tab,_session_variant_two.yaml | 6 ------ .../4_-_Single-site,_multi-tab_session.yaml | 6 ------ .../5_-_Multi-site,_single-tab,_session.yaml | 6 ------ .maestro/privacy_tests/6_-_Multi-tab.yaml | 6 ------ .../7_-_Browser_restart_mid-session.yaml | 6 ------ .../8_-_Navigation_with_back_forward.yaml | 6 ------ .../9_-_Navigation_with_refresh.yaml | 6 ------ .../2_-_AddressBarSpoof,_aboutblank.yaml | 2 +- .maestro/shared/onboarding.yaml | 7 +++++-- .maestro/tabs/open_multiple_tabs.yaml | 9 +++------ 36 files changed, 110 insertions(+), 180 deletions(-) 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 0ceea023b48f..8aec68aa04ea 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-10" - 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 7d8872dd4c4a..3ea65b724986 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-11" - 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 72e9df36e591..60518d18cb23 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-12" - 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 4368591e517f..71a9bb7f7f89 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-13" - 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 367acf429c5a..c56e646d6dfa 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-14" - tapOn: diff --git a/.maestro/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml b/.maestro/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml index a3dec88cb267..0ef176c05d60 100644 --- a/.maestro/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml +++ b/.maestro/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-1" - tapOn: @@ -38,7 +38,7 @@ tags: - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "ad-company.site" + text: "ad-company.site" - action: back - assertVisible: text: "View Non-Tracker Companies" diff --git a/.maestro/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml b/.maestro/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml index fdeaedc8ace6..72a9657fc690 100644 --- a/.maestro/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml +++ b/.maestro/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-2" - tapOn: diff --git a/.maestro/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml b/.maestro/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml index 6f03754c53c9..8602adaf986a 100644 --- a/.maestro/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml +++ b/.maestro/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-3" - tapOn: diff --git a/.maestro/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml b/.maestro/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml index 4d4150810b94..d01859f75c24 100644 --- a/.maestro/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml +++ b/.maestro/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-4" - 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 39763d3a7d79..77bfcdeb067f 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-5" - 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 ac44ce94465d..497894c02606 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -11,12 +11,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-6" - 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 ecedc4749564..03c5726d820f 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-7" - 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 63f0f7db37dd..1eed52397431 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-8" - 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 4b6346a8c1c5..89f7bd91f795 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 @@ -1,6 +1,6 @@ appId: com.duckduckgo.mobile.android tags: - - adClickTest + - adClickTest --- - launchApp: clearState: true @@ -12,11 +12,11 @@ tags: - assertVisible: text: ".*Got It.*" - tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" + text: "Got It" +- tapOn: + id: "com.duckduckgo.mobile.android:id/fireIconMenu" - tapOn: - text: "HIDE TIPS FOREVER" + text: "Cancel" - assertVisible: id: "ad-id-9" - tapOn: diff --git a/.maestro/ads_preview_flows/1-_design-system-components.yaml b/.maestro/ads_preview_flows/1-_design-system-components.yaml index b5555f774300..af6f0181bb10 100644 --- a/.maestro/ads_preview_flows/1-_design-system-components.yaml +++ b/.maestro/ads_preview_flows/1-_design-system-components.yaml @@ -66,7 +66,7 @@ tags: - tapOn: id: "com.duckduckgo.mobile.android:id/primaryCta" - tapOn: "LAYOUTS" -- tapOn: "Primary" +- assertVisible: "Expandable Layout" - tapOn: "INTERACTIVE" - tapOn: id: "com.duckduckgo.mobile.android:id/switch_one" diff --git a/.maestro/custom_tabs/custom_tabs_navigation.yaml b/.maestro/custom_tabs/custom_tabs_navigation.yaml index 3598fe4b8778..b17a0c86cca7 100644 --- a/.maestro/custom_tabs/custom_tabs_navigation.yaml +++ b/.maestro/custom_tabs/custom_tabs_navigation.yaml @@ -8,8 +8,11 @@ tags: stopApp: true - assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" + text: ".*Ready for a better, more private internet?.*" - tapOn: "let's do it!" +- assertVisible: + text: ".*Privacy protections activated.*" +- tapOn: "choose your browser" - runFlow: when: visible: "set as default" @@ -17,7 +20,8 @@ tags: - tapOn: "duckduckgo" - tapOn: "set as default" - assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" + text: ".*Awesome! Welcome to the duck side.*" + - tapOn: "start browsing" - tapOn: id: "com.duckduckgo.mobile.android:id/browserMenuImageView" diff --git a/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml b/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml index f4c4ba5674a6..84bb91b15edf 100644 --- a/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml +++ b/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml @@ -8,8 +8,11 @@ tags: stopApp: true - assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" + text: ".*Ready for a better, more private internet?.*" - tapOn: "let's do it!" +- assertVisible: + text: ".*Privacy protections activated.*" +- tapOn: "choose your browser" - runFlow: when: visible: "set as default" @@ -17,7 +20,8 @@ tags: - tapOn: "duckduckgo" - tapOn: "set as default" - assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" + text: ".*Awesome! Welcome to the duck side.*" + - tapOn: "start browsing" - tapOn: id: "com.duckduckgo.mobile.android:id/browserMenuImageView" diff --git a/.maestro/fire_button/fire_during_onboarding.yaml b/.maestro/fire_button/fire_during_onboarding.yaml index 3d355d3dd777..ea5da487ba66 100644 --- a/.maestro/fire_button/fire_during_onboarding.yaml +++ b/.maestro/fire_button/fire_during_onboarding.yaml @@ -18,13 +18,13 @@ tags: text: ".*keep browsing.*" - tapOn: text: "got it" +- assertVisible: + text: ".*browsing activity with the fire button.*" - tapOn: id: "com.duckduckgo.mobile.android:id/fireIconImageView" -- assertVisible: "Personal data can build up in your browser.*" - tapOn: "Cancel" -- assertNotVisible: "Personal data can build up in your browser.*" +- assertNotVisible: ".*browsing activity with the Fire Button.*" - tapOn: id: "com.duckduckgo.mobile.android:id/fireIconImageView" -- assertNotVisible: "Personal data can build up in your browser.*" - 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 9b689829a654..e77d22ea7d72 100644 --- a/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml +++ b/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml @@ -11,15 +11,18 @@ appId: com.duckduckgo.mobile.android text: ".*Welcome to DuckDuckGo!.*" optional: true - assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" + text: ".*Ready for a better, more private internet?.*" - tapOn: "let's do it!" +- assertVisible: + text: ".*Privacy protections activated.*" +- tapOn: "choose your browser" - tapOn: "cancel" - assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" + text: ".*Try a search!.*" - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + id: "com.duckduckgo.mobile.android:id/browserMenuImageView" - tapOn: - text: "Downloads" + text: "Downloads" - assertVisible: text: ".*No files downloaded yet.*" - assertNotVisible: diff --git a/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml b/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml index 3385855ae1f3..fa3f2d62cdb2 100644 --- a/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml +++ b/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml @@ -11,20 +11,23 @@ appId: com.duckduckgo.mobile.android text: ".*Welcome to DuckDuckGo!.*" optional: true - assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" + text: ".*Ready for a better, more private internet?.*" - tapOn: "let's do it!" +- assertVisible: + text: ".*Privacy protections activated.*" +- tapOn: "choose your browser" - tapOn: "cancel" - assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" + text: ".*Try a search!.*" - tapOn: - id: "com.duckduckgo.mobile.android:id/browserMenuImageView" + id: "com.duckduckgo.mobile.android:id/browserMenuImageView" - tapOn: - text: "Downloads" + text: "Downloads" - assertVisible: - text: ".*Find out when downloads are ready.*" + text: ".*Find out when downloads are ready.*" - assertVisible: - text: ".*Get a notification when downloads complete.*" + text: ".*Get a notification when downloads complete.*" - assertVisible: - text: ".*Notify Me.*" + text: ".*Notify Me.*" - assertVisible: - text: ".*No files downloaded yet.*" + text: ".*No files downloaded yet.*" 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 dca7184ce425..b9fdf8a9c1ef 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 @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: text: "Link with utm_source and 1 standard parameter" - tapOn: 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 8396ddd457d0..cf82b9c50670 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 @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: text: "Link with utm_source and utm_medium" - tapOn: 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 c50489dee67c..4f83e6a142f4 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 @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: text: "Link with fbclid, fb_source and 1 standard parameter" - tapOn: 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 738642978237..b13c29934dd9 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 @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: text: "Link which should not be rewritten" - tapOn: 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 0bbc2a9d852b..ed353acc275f 100644 --- a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - 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 0c3f7c17eb1d..513cde79094d 100644 --- a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml +++ b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - longPressOn: 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 89faea769b61..3df9866959f8 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 @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - 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 23a7afbf2dbb..7d1cf8490672 100644 --- a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml +++ b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - 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 32691fbaeb5d..8b82d4288268 100644 --- a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - tapOn: diff --git a/.maestro/privacy_tests/6_-_Multi-tab.yaml b/.maestro/privacy_tests/6_-_Multi-tab.yaml index 02152f84d979..e82e3c8eb39f 100644 --- a/.maestro/privacy_tests/6_-_Multi-tab.yaml +++ b/.maestro/privacy_tests/6_-_Multi-tab.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - tapOn: diff --git a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml index 4a8d5be3184f..762e819d4cdb 100644 --- a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml +++ b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - tapOn: diff --git a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml index f62dbfbe56cb..6008c45fea9c 100644 --- a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml +++ b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - tapOn: diff --git a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml index a804f5fbde05..e8767fa87122 100644 --- a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml +++ b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml @@ -9,12 +9,6 @@ tags: - pressKey: Enter - assertVisible: text: ".*Got It.*" -- tapOn: - text: "HIDE" -- assertVisible: - text: "HIDE TIPS FOREVER" -- tapOn: - text: "HIDE TIPS FOREVER" - assertVisible: id: "ad-id-5" - tapOn: diff --git a/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml b/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml index 3f64af8b6dcf..f5e8af78fce1 100644 --- a/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml +++ b/.maestro/security_tests/2_-_AddressBarSpoof,_aboutblank.yaml @@ -15,7 +15,7 @@ tags: - extendedWaitUntil: notVisible: "Not DDG." # Spoofed content not visible timeout: 10000 -- tapOn: "Phew!" +- tapOn: "Got it!" - copyTextFrom: id: "omnibarTextInput" - assertTrue: ${maestro.copiedText == "about:blank" || maestro.copiedText == "https://duckduckgo.com/"} \ No newline at end of file diff --git a/.maestro/shared/onboarding.yaml b/.maestro/shared/onboarding.yaml index 666f1d9d144b..104804220109 100644 --- a/.maestro/shared/onboarding.yaml +++ b/.maestro/shared/onboarding.yaml @@ -1,8 +1,11 @@ appId: com.duckduckgo.mobile.android --- - assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" + text: ".*Ready for a better, more private internet?.*" - tapOn: "let's do it!" +- assertVisible: + text: ".*Privacy protections activated.*" +- tapOn: "choose your browser" - tapOn: "cancel" - assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" + text: ".*Try a search!.*" diff --git a/.maestro/tabs/open_multiple_tabs.yaml b/.maestro/tabs/open_multiple_tabs.yaml index a558e07a1eb1..90b6b871aeac 100644 --- a/.maestro/tabs/open_multiple_tabs.yaml +++ b/.maestro/tabs/open_multiple_tabs.yaml @@ -6,12 +6,9 @@ tags: - launchApp: clearState: true stopApp: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" + +- runFlow: ../shared/onboarding.yaml + - tapOn: text: "search or type URL" - inputText: "https://privacy-test-pages.site"