From ab1b78d8c8d85023df692e987496e3168662b69c Mon Sep 17 00:00:00 2001 From: Marcos Date: Fri, 9 Dec 2022 08:58:20 +0000 Subject: [PATCH] Add maestro to CI (#2222) --- .github/workflows/end-to-end.yml | 70 +++++++++++++++++++ ...ovided_but_incorrect_(dsl_not_needed).yaml | 28 ++++---- ...domain_(i.e.,_abcedf)_(u3_not_needed).yaml | 13 ++-- ...main_(i.e.,_abcedf)__(dsl_not_needed).yaml | 13 ++-- ....search-company-site)_(u3_not_needed).yaml | 13 ++-- ...earch-company-site)__(dsl_not_needed).yaml | 20 +++--- ...no_ad_domain_param;_u3_param_included.yaml | 13 ++-- ...o_ad_domain_param;_dsl_param_included.yaml | 13 ++-- ...ad_domain_param,_but_missing_u3_param.yaml | 13 ++-- ...d_domain_param,_but_missing_dsl_param.yaml | 19 +++-- ...n_provided,_but_empty_(u3_not_needed).yaml | 19 +++-- ..._provided,_but_empty_(dsl_not_needed).yaml | 22 +++--- ...d;_ad_domain_provided_(u3_not_needed).yaml | 22 +++--- ...;_ad_domain_provided_(dsl_not_needed).yaml | 25 ++++--- ...rovided_but_incorrect_(u3_not_needed).yaml | 25 ++++--- .maestro/config.yaml | 4 ++ .../1_-_Single-site,_single-tab,_session.yaml | 39 +++++------ .../2_-_Single-site,_new-tab,_session.yaml | 39 +++++------ ...le-site,_new-tab,_session_variant_two.yaml | 39 +++++------ .../4_-_Single-site,_multi-tab_session.yaml | 29 ++++---- .../5_-_Multi-site,_single-tab,_session.yaml | 41 ++++++----- .../privacy_tests}/6_-_Multi-tab.yaml | 32 ++++----- .../7_-_Browser_restart_mid-session.yaml | 39 +++++------ .../8_-_Navigation_with_back_forward.yaml | 39 +++++------ .../9_-_Navigation_with_refresh.yaml | 39 +++++------ settings.gradle | 2 +- 26 files changed, 364 insertions(+), 306 deletions(-) create mode 100644 .github/workflows/end-to-end.yml rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml (78%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .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 (88%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .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 (88%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .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 (88%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .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 (85%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml (84%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml (84%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml (84%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml (81%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml (85%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/6_-_m.js_heuristic;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml (85%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/7_-_y.js_bing-provided;_ad_domain_provided_(u3_not_needed).yaml (85%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/8_-_m.js_bing-provided;_ad_domain_provided_(dsl_not_needed).yaml (83%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests => .maestro}/ad_click_detection_flows/9_-_y.js_bing-provided;_ad_domain_provided_but_incorrect_(u3_not_needed).yaml (78%) create mode 100644 .maestro/config.yaml rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/1_-_Single-site,_single-tab,_session.yaml (86%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/2_-_Single-site,_new-tab,_session.yaml (86%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/3_-_Single-site,_new-tab,_session_variant_two.yaml (86%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/4_-_Single-site,_multi-tab_session.yaml (87%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/5_-_Multi-site,_single-tab,_session.yaml (85%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/6_-_Multi-tab.yaml (86%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/7_-_Browser_restart_mid-session.yaml (85%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/8_-_Navigation_with_back_forward.yaml (88%) rename {ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages => .maestro/privacy_tests}/9_-_Navigation_with_refresh.yaml (86%) diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml new file mode 100644 index 000000000000..08f09d8ca965 --- /dev/null +++ b/.github/workflows/end-to-end.yml @@ -0,0 +1,70 @@ +name: End-to-End tests + +on: + schedule: + - cron: '0 4 * * *' # run at 4 AM UTC + workflow_dispatch: + +concurrency: + group: ${{ github.head_ref || github.ref_name }} + cancel-in-progress: true + +jobs: + instrumentation_tests: + runs-on: ubuntu-latest + name: End-to-End tests + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'adopt' + + - name: Create folder + if: always() + run: mkdir apk + + - name: Decode keys + uses: davidSchuppa/base64Secret-toFile-action@v2 + with: + secret: ${{ secrets.FAKE_RELEASE_PROPERTIES }} + fileName: ddg_android_build.properties + destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/ + + - name: Decode key file + uses: davidSchuppa/base64Secret-toFile-action@v2 + with: + secret: ${{ secrets.FAKE_RELEASE_KEY }} + fileName: android + destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/ + + - name: Assemble release APK + uses: gradle/gradle-build-action@v2 + with: + arguments: assemblePlayRelease + + - name: Move APK to new folder + if: always() + run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; + + - name: Ad click detection flows + uses: mobile-dev-inc/action-maestro-cloud@v1.1.1 + with: + api-key: ${{ secrets.MOBILE_DEV_API_KEY }} + name: ${{ github.sha }} + app-file: apk/release.apk + workspace: .maestro/ad_click_detection_flows + + - name: Privacy Tests + uses: mobile-dev-inc/action-maestro-cloud@v1.1.1 + with: + api-key: ${{ secrets.MOBILE_DEV_API_KEY }} + name: ${{ github.sha }} + app-file: apk/release.apk + workspace: .maestro/privacy_tests \ No newline at end of file diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 78% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml rename to .maestro/ad_click_detection_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml index ccbb65203aa6..fe28afb7a2e5 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,12 +18,15 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll -- assertVisible: - id: "ad-id-7" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 +- swipe: + start: 100,1000 + end: 100,200 +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-10" - tapOn: @@ -34,9 +36,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -46,12 +48,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 88% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/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 rename to .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 aa79431e36cc..506a45ca7411 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -37,9 +36,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -47,12 +46,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 88% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/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 rename to .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 7aab8db8720f..3cfe28566333 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -37,9 +36,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -47,12 +46,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 88% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/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 rename to .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 ee34c16e5601..a3957e6bf344 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -37,9 +36,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -47,12 +46,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 85% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/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 rename to .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 6ad06f69e2a4..ce9d2e667914 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -22,12 +21,11 @@ appId: com.duckduckgo.mobile.android - assertVisible: id: "ad-id-3" - action: scroll -- assertVisible: - id: "ad-id-7" - action: scroll -- assertVisible: - id: "ad-id-10" - action: scroll +- swipe: + direction: UP + duration: 2000 - assertVisible: id: "ad-id-14" - tapOn: @@ -37,9 +35,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -47,12 +45,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 84% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml rename to .maestro/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml index 7b458ad05991..81dc526270b1 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -28,9 +27,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -40,12 +39,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 84% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml rename to .maestro/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml index f54bface280f..52ee75f1e87b 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -28,9 +27,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -40,12 +39,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 84% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml rename to .maestro/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml index ddf0cd8abb44..75c9ac2f3963 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -28,9 +27,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -40,12 +39,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 81% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml rename to .maestro/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml index 68ea81a9298f..be97879b5687 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-4" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -43,12 +42,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 85% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml rename to .maestro/ad_click_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml index ccfb42ff6710..b39dc0939d79 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 85% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/6_-_m.js_heuristic;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml rename to .maestro/ad_click_detection_flows/6_-_m.js_heuristic;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml index b355c6a228d5..b351d1aa100f 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,12 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-6" - tapOn: @@ -31,9 +33,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +43,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 85% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/7_-_y.js_bing-provided;_ad_domain_provided_(u3_not_needed).yaml rename to .maestro/ad_click_detection_flows/7_-_y.js_bing-provided;_ad_domain_provided_(u3_not_needed).yaml index 4be5f5c41bad..50ba101b16c5 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,12 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-7" - tapOn: @@ -31,9 +33,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +43,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 83% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/8_-_m.js_bing-provided;_ad_domain_provided_(dsl_not_needed).yaml rename to .maestro/ad_click_detection_flows/8_-_m.js_bing-provided;_ad_domain_provided_(dsl_not_needed).yaml index 04ad7fa9d3c7..c409c0414e22 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,12 +18,12 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll -- assertVisible: - id: "ad-id-7" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-8" - tapOn: @@ -34,9 +33,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -44,12 +43,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 similarity index 78% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/ad_click_detection_flows/9_-_y.js_bing-provided;_ad_domain_provided_but_incorrect_(u3_not_needed).yaml rename to .maestro/ad_click_detection_flows/9_-_y.js_bing-provided;_ad_domain_provided_but_incorrect_(u3_not_needed).yaml index dfbdda12e12c..085120ab7ad6 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/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 @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,12 +18,12 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll -- assertVisible: - id: "ad-id-7" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-9" - tapOn: @@ -34,9 +33,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -46,12 +45,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: "convert.ad-company.site" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/.maestro/config.yaml b/.maestro/config.yaml new file mode 100644 index 000000000000..63adb8a747fb --- /dev/null +++ b/.maestro/config.yaml @@ -0,0 +1,4 @@ +appStartup: + enabled: false +appSize: + enabled: false \ No newline at end of file diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/1_-_Single-site,_single-tab,_session.yaml b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml similarity index 86% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/1_-_Single-site,_single-tab,_session.yaml rename to .maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml index fbb55d961d99..b5dc19ecd12c 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/1_-_Single-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -72,9 +71,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -82,12 +81,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -111,9 +110,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -121,12 +120,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/2_-_Single-site,_new-tab,_session.yaml b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml similarity index 86% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/2_-_Single-site,_new-tab,_session.yaml rename to .maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml index 4ba2728b81d7..c73603a6a57d 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/2_-_Single-site,_new-tab,_session.yaml +++ b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - longPressOn: @@ -35,9 +34,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -45,12 +44,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -76,9 +75,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -86,12 +85,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -115,9 +114,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -125,12 +124,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/3_-_Single-site,_new-tab,_session_variant_two.yaml b/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml similarity index 86% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/3_-_Single-site,_new-tab,_session_variant_two.yaml rename to .maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml index a65229f75834..691258d1a0a5 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/3_-_Single-site,_new-tab,_session_variant_two.yaml +++ b/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -76,9 +75,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -86,12 +85,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -115,9 +114,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -125,12 +124,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/4_-_Single-site,_multi-tab_session.yaml b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml similarity index 87% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/4_-_Single-site,_multi-tab_session.yaml rename to .maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml index 695dc39ff358..b4e7c8db479e 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/4_-_Single-site,_multi-tab_session.yaml +++ b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -88,9 +87,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -98,12 +97,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/5_-_Multi-site,_single-tab,_session.yaml b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml similarity index 85% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/5_-_Multi-site,_single-tab,_session.yaml rename to .maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml index 27ae95bbe554..e2e00c3227db 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/5_-_Multi-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -88,9 +87,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -98,14 +97,14 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - assertVisible: text: "convert.ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: @@ -119,13 +118,13 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "pay-button" - assertVisible: - text: ".*Order complete.*" + text: "Order complete.*" - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -133,12 +132,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/6_-_Multi-tab.yaml b/.maestro/privacy_tests/6_-_Multi-tab.yaml similarity index 86% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/6_-_Multi-tab.yaml rename to .maestro/privacy_tests/6_-_Multi-tab.yaml index 7e64e172f2bb..6f9a15af7dc6 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/6_-_Multi-tab.yaml +++ b/.maestro/privacy_tests/6_-_Multi-tab.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -80,8 +79,7 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarTextInput" - inputText: "https://www.publisher-company.site/product.html?p=200" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: "Red shoes" - assertVisible: @@ -101,9 +99,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -111,14 +109,14 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - assertVisible: text: "convert.ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/7_-_Browser_restart_mid-session.yaml b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml similarity index 85% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/7_-_Browser_restart_mid-session.yaml rename to .maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml index 1c169f713385..61019273c7d9 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/7_-_Browser_restart_mid-session.yaml +++ b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -74,9 +73,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -84,12 +83,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -122,9 +121,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -132,14 +131,14 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - assertVisible: text: "convert.ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/8_-_Navigation_with_back_forward.yaml b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml similarity index 88% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/8_-_Navigation_with_back_forward.yaml rename to .maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml index 932160b9839e..2ae762159cfb 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/8_-_Navigation_with_back_forward.yaml +++ b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -88,9 +87,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -98,14 +97,14 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - assertVisible: text: "convert.ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: @@ -153,9 +152,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -163,12 +162,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/9_-_Navigation_with_refresh.yaml b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml similarity index 86% rename from ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/9_-_Navigation_with_refresh.yaml rename to .maestro/privacy_tests/9_-_Navigation_with_refresh.yaml index 916361542296..567c5e1ecfa2 100644 --- a/ad-click/ad-click-impl/src/test/resources/maestro_tests/privacy_test_pages/9_-_Navigation_with_refresh.yaml +++ b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml @@ -9,8 +9,7 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*I'll also upgrade the security of your connection if possible.*" - inputText: "https://www.search-company.site/" -- tapOn: - id: ".*key_pos_ime_action.*" +- pressKey: Enter - assertVisible: text: ".*Got It.*" - tapOn: @@ -19,9 +18,9 @@ appId: com.duckduckgo.mobile.android text: "HIDE TIPS FOREVER" - tapOn: text: "HIDE TIPS FOREVER" -- assertVisible: - id: "ad-id-3" -- action: scroll +- swipe: + start: 100,1000 + end: 100,200 - assertVisible: id: "ad-id-5" - tapOn: @@ -31,9 +30,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -41,12 +40,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: @@ -88,9 +87,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -98,14 +97,14 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - assertVisible: text: "convert.ad-company.site" - action: back - assertVisible: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - tapOn: - text: "No Third-Party Requests Found" + text: "View Non-Tracker Companies" - assertVisible: text: "We did not identify any requests from third-party domains." - assertVisible: @@ -129,9 +128,9 @@ appId: com.duckduckgo.mobile.android - tapOn: id: "com.duckduckgo.mobile.android:id/omnibarIconContainer" - assertVisible: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - tapOn: - text: "Requests Blocked from Loading" + text: "View Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you." - assertVisible: @@ -139,12 +138,12 @@ appId: com.duckduckgo.mobile.android - assertVisible: text: ".*Ad Company" - assertVisible: - text: "www.ad-company.site" + text: "ad-company.site" - action: back - assertVisible: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - tapOn: - text: "Third-Party Requests Loaded" + text: "View Non-Tracker Companies" - assertVisible: text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply." - assertVisible: diff --git a/settings.gradle b/settings.gradle index 62bd6be24518..593a395d202d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ plugins { rootDir.eachFile(groovy.io.FileType.DIRECTORIES) { File parent -> - String[] ignoreFolders = ["buildSrc", "fastlane", "submodules", "node_modules", "gradle", "build"] + String[] ignoreFolders = ["buildSrc", "fastlane", "submodules", "node_modules", "gradle", "build", ".maestro"] if (!parent.name.startsWith(".") && !ignoreFolders.contains(parent.name)) { Boolean shouldAddProject = false parent.eachFile {