duckduckgo · alessandroboron · Aug 14, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -54,19 +54,19 @@ jobs:
 
     - name: Release tests
       run: |
-        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=release DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
+        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} -e ONBOARDING_COMPLETED=true --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=release DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
 
     - name: Privacy tests
       run: |
-        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=privacy DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
+        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} -e ONBOARDING_COMPLETED=true --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=privacy DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
 
     - name: Security tests
       run: |
-        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=securityTest DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
-    
+        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} -e ONBOARDING_COMPLETED=true --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=securityTest DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
+
     - name: Ad Click Detection Flow tests
       run: |
-        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=adClick DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
+        export PATH="$PATH":"$HOME/.maestro/bin"; maestro cloud --apiKey ${{ secrets.MAESTRO_CLOUD_API_KEY }} -e ONBOARDING_COMPLETED=true --fail-on-timeout=true --fail-on-cancellation=true --timeout=150 --ios-version=17 --include-tags=adClick DerivedData/Build/Products/Debug-iphonesimulator/DuckDuckGo.app .maestro/
 
     - name: Create Asana task when workflow failed
       if: ${{ failure() }}

diff --git a/.../ad_click_detection_flow_tests/01_yjs_heuristic_no_ad_domain_param_u3_param_included.yaml b/.../ad_click_detection_flow_tests/01_yjs_heuristic_no_ad_domain_param_u3_param_included.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-1"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 # Test Ad1
 - assertVisible:
     text: "[Ad 1] SERP Ad (heuristic)"

diff --git a/...ad_click_detection_flow_tests/02_mjs_heuristic_no_ad_domain_param_dsl_param_included.yaml b/...ad_click_detection_flow_tests/02_mjs_heuristic_no_ad_domain_param_dsl_param_included.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-2"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 # Test Ad2
 - assertVisible:
     text: "[Ad 2] Shopping Tab Ad (heuristic)"

diff --git a/..._click_detection_flow_tests/03_yjs_heuristic_no_ad_domain_param_but_missing_u3_param.yaml b/..._click_detection_flow_tests/03_yjs_heuristic_no_ad_domain_param_but_missing_u3_param.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-3"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 # Test Ad3
 - assertVisible:
     text: "[Ad 3] SERP Ad (heuristic)"

diff --git a/...click_detection_flow_tests/04_mjs_heuristic_no_ad_domain_param_but_missing_dsl_param.yaml b/...click_detection_flow_tests/04_mjs_heuristic_no_ad_domain_param_but_missing_dsl_param.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-4"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 4] Shopping Tab Ad (heuristic)"
 - tapOn:

diff --git a/...ick_detection_flow_tests/05_yjs_heuristic_ad_domain_provided_but_empty_u3_not_needed.yaml b/...ick_detection_flow_tests/05_yjs_heuristic_ad_domain_provided_but_empty_u3_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-5"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 5] SERP Ad (heuristic)"
 - tapOn:

diff --git a/...ck_detection_flow_tests/06_mjs_heuristic_ad_domain_provided_but_empty_dsl_not_needed.yaml b/...ck_detection_flow_tests/06_mjs_heuristic_ad_domain_provided_but_empty_dsl_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-6"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible: 
     text: "[Ad 6] Shopping Tab Ad (heuristic)"
 - tapOn:

diff --git a/.../ad_click_detection_flow_tests/07_yjs_bing-provided_ad_domain_provided_u3_not_needed.yaml b/.../ad_click_detection_flow_tests/07_yjs_bing-provided_ad_domain_provided_u3_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-7"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 7] SERP Ad (SERP-provided)"
 - tapOn:

diff --git a/...ad_click_detection_flow_tests/08_mjs_bing-provided_ad_domain_provided_dsl_not_needed.yaml b/...ad_click_detection_flow_tests/08_mjs_bing-provided_ad_domain_provided_dsl_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-8"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible: 
     text: "[Ad 8] Shopping Tab Ad (SERP-provided)"
 - tapOn:

diff --git a/...ction_flow_tests/09_yjs_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml b/...ction_flow_tests/09_yjs_bing-provided_ad_domain_provided_but_incorrect_u3_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-9"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 # Test Ad9
 - assertVisible:
     text: "[Ad 9] SERP Ad (SERP-provided)"

diff --git a/...tion_flow_tests/10_mjs_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml b/...tion_flow_tests/10_mjs_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-10"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 10] Shopping Tab Ad (SERP-provided)"
 - tapOn:

diff --git a/...low_tests/11_yjs_bing-provided_ad_domain_provided_but_its_not_a_domain_u3_not_needed.yaml b/...low_tests/11_yjs_bing-provided_ad_domain_provided_but_its_not_a_domain_u3_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-11"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 11] SERP Ad (heuristic)"
 - tapOn:

diff --git a/...ow_tests/12_mjs_bing-provided_ad_domain_provided_but_its_not_a_domain_dsl_not_needed.yaml b/...ow_tests/12_mjs_bing-provided_ad_domain_provided_but_its_not_a_domain_dsl_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-12"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 12] Shopping Tab Ad (heuristic)"
 - tapOn:

diff --git a/...yjs_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_u3_not_needed.yaml b/...yjs_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_u3_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-13"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text: "[Ad 13] SERP Ad (SERP-provided)"
 - tapOn:

diff --git a/...js_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_dsl_not_needed.yaml b/...js_bing-provided_ad_domain_provided_but_its_a_subdomain_of_advertiser_dsl_not_needed.yaml
@@ -16,14 +16,6 @@ tags:
 - inputText: "https://www.search-company.site/#ad-id-14"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible:
     text:  "[Ad 14] Shopping Tab Ad (SERP-provided)"
 - tapOn:

diff --git a/.maestro/browser_features/opening_tabs.yaml b/.maestro/browser_features/opening_tabs.yaml
@@ -17,14 +17,6 @@ tags:
 - inputText: "https://privacy-test-pages.site"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible: ".*Privacy Test Pages.*"
 - tapOn: "Links Open in New Window"
 

diff --git a/.maestro/browser_features/search_bar.yaml b/.maestro/browser_features/search_bar.yaml
@@ -17,14 +17,6 @@ tags:
 - inputText: "https://privacy-test-pages.site/features/auto-refresh.html"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible: "Website that refreshes every 3 seconds."
 
 # Start typing

diff --git a/.maestro/browser_features/swipe_tabs.yaml b/.maestro/browser_features/swipe_tabs.yaml
@@ -17,14 +17,6 @@ tags:
 - inputText: "https://www.search-company.site"
 - pressKey: Enter
 
-# Manage onboarding
-- runFlow:
-    when:
-      visible:
-        text: "Got It"
-        index: 0
-    file: ../shared/onboarding_browsing.yaml
-
 - assertVisible: "Search engine"
 
 # Open New Tab

diff --git a/.maestro/data_clearing_tests/02_duckduckgo_settings.yml b/.maestro/data_clearing_tests/02_duckduckgo_settings.yml
@@ -16,15 +16,8 @@ tags:
 - inputText: "privacy blogs"
 - pressKey: Enter
 
-# Dismiss Dax Dialogs if visible
-- runFlow:
-    when:
-        visible: "Phew!"
-    commands:
-        - tapOn: "Phew!"
-
 # Change settings
-- tapOn: "Safe search: moderate ▼"
+- tapOn: "Safe search: moderate"
 - tapOn: "Off"
 
 # Fire Button - twice, just to be sure
@@ -47,4 +40,4 @@ tags:
     id: "searchEntry"
 - inputText: "creepy trackers"
 - pressKey: Enter
-- assertVisible: "Safe search: off ▼"
+- assertVisible: "Safe search: off"
diff --git a/.maestro/onboarding_tests/01_control_group_onboarding.yaml b/.maestro/onboarding_tests/01_control_group_onboarding.yaml
@@ -0,0 +1,29 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - onboarding
+
+---
+
+# Set up
+- runFlow:
+    file: ../shared/setup.yaml
+    env:
+        ONBOARDING_COMPLETED: "false"
+        APP_VARIANT: "ma"
+
+# Load Site
+- assertVisible:
+    id: "searchEntry"
+- tapOn:
+    id: "searchEntry"
+- inputText: "https://www.duckduckgo.com"
+- pressKey: Enter
+
+# Handle Onboarding
+- assertVisible: "Got It"
+- assertVisible: "Hide"
+- tapOn: "Got It"
+- assertVisible: "Close Tabs and Clear Data"
+- tapOn: "Close Tabs and Clear Data"
+- tapOn: "Close Tabs and Clear Data"
+- assertVisible: "You’ve got this!\n\nRemember: Every time you browse with me, a creepy ad loses its wings. 👍"
diff --git a/.maestro/onboarding_tests/02_control_group_hide_onboarding.yaml b/.maestro/onboarding_tests/02_control_group_hide_onboarding.yaml
@@ -0,0 +1,33 @@
+appId: com.duckduckgo.mobile.ios
+tags:
+    - onboarding
+
+---
+
+# Set up
+- runFlow:
+    file: ../shared/setup.yaml
+    env:
+        ONBOARDING_COMPLETED: "false"
+        APP_VARIANT: "ma"
+
+# Load Site
+- assertVisible:
+    id: "searchEntry"
+- tapOn:
+    id: "searchEntry"
+- inputText: "https://www.duckduckgo.com"
+- pressKey: Enter
+
+# Handle Onboarding
+- assertVisible: "Got It"
+- assertVisible: "Hide"
+- tapOn: "Hide"
+- assertVisible: "Hide Tips Forever"
+- tapOn: "Hide Tips Forever"
+
+# Handle Fire Button
+- assertVisible: "Close Tabs and Clear Data"
+- tapOn: "Close Tabs and Clear Data"
+- tapOn: "Close Tabs and Clear Data"
+- assertNotVisible: "You’ve got this!\n\nRemember: Every time you browse with me, a creepy ad loses its wings. 👍"