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
duckduckgo · Aug 15, 2023 · 78577ca · 78577ca
1 parent d451b7f
commit 78577ca
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 81 deletions.
diff --git 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
@@ -71,4 +71,5 @@ jobs:
           api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
           name: ${{ github.sha }}
           app-file: apk/release.apk
-          workspace: .maestro/privacy_tests
+          workspace: .maestro
+          include-tags: privacyTest
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...stro/privacy_tests/12_-_Query_Parameters,_fbclid,_fb_source_and_1_standard_parameter.yaml b/...stro/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: