From 78577ca186454c004accdbf13a284cbc13a193e8 Mon Sep 17 00:00:00 2001 From: Aitor Viana Date: Tue, 15 Aug 2023 16:44:50 +0100 Subject: [PATCH] Move privacy maestro test to use tags (#3459) Task/Issue URL: https://app.asana.com/0/0/1205258019391734/f ### Description Move e2e privacy test to use shared onboarding flow, and use the tag `privacyTest` ### Steps to test this PR https://github.com/duckduckgo/Android/actions/runs/5868616041/job/15911849417 passes --- .github/workflows/end-to-end.yml | 3 ++- .github/workflows/privacy-dashboard-end-to-end.yml | 3 ++- .github/workflows/sync-end-to-end.yml | 2 +- .../1_-_permissions_allowed.yaml | 1 + .../2_-_permissions_denied.yaml | 1 + ..._Parameters,_utm_source_and_1_standard_parameter.yaml | 9 +++------ ...11_-_Query_Parameters,_utm_source_and_utm_medium.yaml | 9 +++------ ...ters,_fbclid,_fb_source_and_1_standard_parameter.yaml | 9 +++------ ...y_Parameters,_link_which_should_not_be_rewritten.yaml | 9 +++------ .../1_-_Single-site,_single-tab,_session.yaml | 9 +++------ .../privacy_tests/2_-_Single-site,_new-tab,_session.yaml | 9 +++------ .../3_-_Single-site,_new-tab,_session_variant_two.yaml | 9 +++------ .../4_-_Single-site,_multi-tab_session.yaml | 9 +++------ .../5_-_Multi-site,_single-tab,_session.yaml | 9 +++------ .maestro/privacy_tests/6_-_Multi-tab.yaml | 9 +++------ .../privacy_tests/7_-_Browser_restart_mid-session.yaml | 9 +++------ .../privacy_tests/8_-_Navigation_with_back_forward.yaml | 9 +++------ .maestro/privacy_tests/9_-_Navigation_with_refresh.yaml | 9 +++------ 18 files changed, 46 insertions(+), 81 deletions(-) diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml index a4fc97d7fac8..400a4354e7e7 100644 --- a/.github/workflows/end-to-end.yml +++ b/.github/workflows/end-to-end.yml @@ -70,7 +70,8 @@ jobs: name: ${{ github.sha }} app-file: apk/release.apk android-api-level: 30 - workspace: .maestro/privacy_tests + workspace: .maestro + include-tags: privacyTest - name: Release Tests if: always() diff --git a/.github/workflows/privacy-dashboard-end-to-end.yml b/.github/workflows/privacy-dashboard-end-to-end.yml index 35402780124c..b0d9277692b7 100644 --- a/.github/workflows/privacy-dashboard-end-to-end.yml +++ b/.github/workflows/privacy-dashboard-end-to-end.yml @@ -71,4 +71,5 @@ jobs: 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 + workspace: .maestro + include-tags: privacyTest diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml index a2ed4bd2c09d..2816e8cff5a6 100644 --- a/.github/workflows/sync-end-to-end.yml +++ b/.github/workflows/sync-end-to-end.yml @@ -21,7 +21,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' - name: Create folder diff --git a/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml b/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml index 07bf9481afc5..9b689829a654 100644 --- a/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml +++ b/.maestro/notifications_permissions_android13_plus/1_-_permissions_allowed.yaml @@ -9,6 +9,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "Allow" - assertVisible: text: ".*Welcome to DuckDuckGo!.*" + optional: true - assertVisible: text: ".*Not to worry! Searching and browsing privately.*" - tapOn: "let's do it!" diff --git a/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml b/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml index 63ec377d9804..3385855ae1f3 100644 --- a/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml +++ b/.maestro/notifications_permissions_android13_plus/2_-_permissions_denied.yaml @@ -9,6 +9,7 @@ appId: com.duckduckgo.mobile.android - tapOn: "Don’t allow" - assertVisible: text: ".*Welcome to DuckDuckGo!.*" + optional: true - assertVisible: text: ".*Not to worry! Searching and browsing privately.*" - tapOn: "let's do it!" diff --git a/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml b/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml index f78a50f649c5..bbd4591fc6a2 100644 --- a/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml +++ b/.maestro/privacy_tests/10_-_Query_Parameters,_utm_source_and_1_standard_parameter.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml b/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml index 9595bc6f4b55..2007e6f189d8 100644 --- a/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml +++ b/.maestro/privacy_tests/11_-_Query_Parameters,_utm_source_and_utm_medium.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml b/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml index 4071053be822..d89eacd4cf6d 100644 --- a/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml +++ b/.maestro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml b/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml index 2b0cb49d5a48..0970ee2c5d43 100644 --- a/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml +++ b/.maestro/privacy_tests/13_-_Query_Parameters,_link_which_should_not_be_rewritten.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://privacy-test-pages.glitch.me/privacy-protections/query-parameters/" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml index 27e6ffcc7d86..0bbc2a9d852b 100644 --- a/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/1_-_Single-site,_single-tab,_session.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml index b05fb0c229b2..0c3f7c17eb1d 100644 --- a/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml +++ b/.maestro/privacy_tests/2_-_Single-site,_new-tab,_session.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml b/.maestro/privacy_tests/3_-_Single-site,_new-tab,_session_variant_two.yaml index 456db6e12a3f..89faea769b61 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 @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml index 90d1ae7933d1..23a7afbf2dbb 100644 --- a/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml +++ b/.maestro/privacy_tests/4_-_Single-site,_multi-tab_session.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml index ca7e95f4eac9..32691fbaeb5d 100644 --- a/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml +++ b/.maestro/privacy_tests/5_-_Multi-site,_single-tab,_session.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/6_-_Multi-tab.yaml b/.maestro/privacy_tests/6_-_Multi-tab.yaml index 5897d27d1a70..02152f84d979 100644 --- a/.maestro/privacy_tests/6_-_Multi-tab.yaml +++ b/.maestro/privacy_tests/6_-_Multi-tab.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml index 2e156868e797..4a8d5be3184f 100644 --- a/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml +++ b/.maestro/privacy_tests/7_-_Browser_restart_mid-session.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml index 396d3abff823..f62dbfbe56cb 100644 --- a/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml +++ b/.maestro/privacy_tests/8_-_Navigation_with_back_forward.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: diff --git a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml index c4fb711d6d81..a804f5fbde05 100644 --- a/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml +++ b/.maestro/privacy_tests/9_-_Navigation_with_refresh.yaml @@ -1,13 +1,10 @@ appId: com.duckduckgo.mobile.android +tags: + - privacyTest --- - launchApp: clearState: true -- assertVisible: - text: ".*Not to worry! Searching and browsing privately.*" -- tapOn: "let's do it!" -- tapOn: "cancel" -- assertVisible: - text: ".*I'll also upgrade the security of your connection if possible.*" +- runFlow: ../shared/onboarding.yaml - inputText: "https://www.search-company.site/#ad-id-5" - pressKey: Enter - assertVisible: