From ba61cd522d6e775871b61cbc7e5244da39c5e4dd Mon Sep 17 00:00:00 2001 From: Marcos Date: Tue, 18 Apr 2023 14:14:54 +0100 Subject: [PATCH] Use anchor links for add click maestro tests (#3065) Task/Issue URL: https://app.asana.com/0/488551667048375/1204397066248823/f ### Description This PR changes the ad click maestro tests to use anchor links instead of scrolling ### Steps to test this PR - [ ] Maestro tests should pass, see https://github.com/duckduckgo/Android/actions/runs/4699277675 --------- Co-authored-by: Cristian Monforte --- .github/workflows/end-to-end.yml | 8 ++++---- ...ad_domain_provided_but_incorrect_(dsl_not_needed).yaml | 6 +----- ..._it's_not_a_domain_(i.e.,_abcedf)_(u3_not_needed).yaml | 6 +----- ...t's_not_a_domain_(i.e.,_abcedf)__(dsl_not_needed).yaml | 7 +------ ....e.,_foo.www.search-company-site)_(u3_not_needed).yaml | 7 +------ ....,_foo.www.search-company-site)__(dsl_not_needed).yaml | 7 +------ ..._heuristic;_no_ad_domain_param;_u3_param_included.yaml | 2 +- ...heuristic;_no_ad_domain_param;_dsl_param_included.yaml | 2 +- ...uristic;_no_ad_domain_param,_but_missing_u3_param.yaml | 2 +- ...ristic;_no_ad_domain_param,_but_missing_dsl_param.yaml | 3 +-- ...ic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml | 3 +-- ...c;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml | 4 +--- ...bing-provided;_ad_domain_provided_(u3_not_needed).yaml | 4 +--- ...ing-provided;_ad_domain_provided_(dsl_not_needed).yaml | 5 +---- ..._ad_domain_provided_but_incorrect_(u3_not_needed).yaml | 5 +---- .../1_-_Single-site,_single-tab,_session.yaml | 5 +---- .../privacy_tests/2_-_Single-site,_new-tab,_session.yaml | 5 +---- .../3_-_Single-site,_new-tab,_session_variant_two.yaml | 5 +---- .../privacy_tests/4_-_Single-site,_multi-tab_session.yaml | 5 +---- .../5_-_Multi-site,_single-tab,_session.yaml | 5 +---- .maestro/privacy_tests/6_-_Multi-tab.yaml | 5 +---- .../privacy_tests/7_-_Browser_restart_mid-session.yaml | 5 +---- .../privacy_tests/8_-_Navigation_with_back_forward.yaml | 5 +---- .maestro/privacy_tests/9_-_Navigation_with_refresh.yaml | 5 +---- 24 files changed, 27 insertions(+), 89 deletions(-) diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index 984aaf37eae5..b12c235196c8 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -54,7 +54,7 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: Ad click detection flows - uses: mobile-dev-inc/action-maestro-cloud@v1.2.3 + uses: mobile-dev-inc/action-maestro-cloud@v1.3.1 with: api-key: ${{ secrets.MOBILE_DEV_API_KEY }} name: ${{ github.sha }} @@ -64,7 +64,7 @@ jobs: - name: Privacy Tests if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.2.3 + uses: mobile-dev-inc/action-maestro-cloud@v1.3.1 with: api-key: ${{ secrets.MOBILE_DEV_API_KEY }} name: ${{ github.sha }} @@ -74,7 +74,7 @@ jobs: - name: Release Tests if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.2.3 + uses: mobile-dev-inc/action-maestro-cloud@v1.3.1 with: api-key: ${{ secrets.MOBILE_DEV_API_KEY }} name: ${{ github.sha }} @@ -84,7 +84,7 @@ jobs: - name: Notifications permissions Android 13+ if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.2.3 + uses: mobile-dev-inc/action-maestro-cloud@v1.3.1 with: api-key: ${{ secrets.MOBILE_DEV_API_KEY }} name: ${{ github.sha }} 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 2d866d148c63..e6e31a4ddd08 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-10" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,10 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll -- scroll - 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 626ee8fba781..8a05c77ef879 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-11" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,10 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll -- scroll - 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 8e7fad8c0c94..a3a8bf786033 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-12" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,11 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll -- scroll -- scroll - 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 df61af2fc7cd..8ca10e8b4c9d 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-13" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,11 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll -- scroll -- scroll - 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 720f9fd1ec94..71b3b8b46757 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-14" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,11 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll -- scroll -- scroll - 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 81dc526270b1..ae4fc2a19d8f 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 @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-1" - pressKey: Enter - assertVisible: text: ".*Got It.*" 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 52ee75f1e87b..57355b4521d1 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 @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-2" - pressKey: Enter - assertVisible: text: ".*Got It.*" 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 75c9ac2f3963..4c6b621ac524 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 @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-3" - pressKey: Enter - assertVisible: text: ".*Got It.*" 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 0ca56a9e9bed..a5f0fdb49103 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 @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-4" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,7 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll - 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 d6b20d6e36ce..838c5029d324 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,7 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll - 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 5b97ac039170..3543a34cedcc 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-6" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,8 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll - 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 f4ceee3186ac..9027ce7c4c36 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- 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 - assertVisible: text: ".*Got It.*" @@ -18,8 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll - 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 6b635af73d9d..334cd1e6baa6 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-8" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll - 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 731338847bd5..5e53f68e00fe 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 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-9" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- scroll -- scroll -- scroll - assertVisible: id: "ad-id-9" - 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 b5dc19ecd12c..27e6ffcc7d86 100644 --- a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 c73603a6a57d..b05fb0c229b2 100644 --- a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml +++ b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 691258d1a0a5..456db6e12a3f 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 @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 b4e7c8db479e..90d1ae7933d1 100644 --- a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml +++ b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 e2e00c3227db..ca7e95f4eac9 100644 --- a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 6f9a15af7dc6..5897d27d1a70 100644 --- a/.maestro/privacy_tests/6_-_Multi-tab.yaml +++ b/.maestro/privacy_tests/6_-_Multi-tab.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 61019273c7d9..2e156868e797 100644 --- a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml +++ b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 2ae762159cfb..396d3abff823 100644 --- a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml +++ b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - 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 567c5e1ecfa2..c4fb711d6d81 100644 --- a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml +++ b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml @@ -8,7 +8,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "cancel" - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" -- inputText: "https://www.search-company.site/" +- inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: text: ".*Got It.*" @@ -18,9 +18,6 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- swipe: - start: 100,1000 - end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: