Merges the latest from main

duckduckgo · Jul 19, 2024 · 9da9e52 · 9da9e52
2 parents 8782b52 + 860ec2e
commit 9da9e52
Show file tree

Hide file tree

Showing 91 changed files with 1,322 additions and 579 deletions.
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
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -5,15 +5,9 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
-
+    file: ../shared/setup.yaml
+
 # Load Site
 - assertVisible:
     id: "searchEntry"

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
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -3,14 +3,10 @@ tags:
     - adClick
 
 ---
-- clearState
-- launchApp
+
+# Set up
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -3,14 +3,10 @@ tags:
     - adClick
 
 ---
-- clearState
-- launchApp
+
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -3,14 +3,10 @@ tags:
     - adClick
 
 ---
-- clearState
-- launchApp
-- runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+
+# Set up 
+- runFlow:
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -4,14 +4,9 @@ tags:
 
 ---
 
-- clearState
-- launchApp
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -4,14 +4,9 @@ tags:
 
 ---
 
-- clearState
-- launchApp
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -4,14 +4,9 @@ tags:
 
 ---
 
-- clearState
-- launchApp
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -4,14 +4,9 @@ tags:
 
 ---
 
-- clearState
-- launchApp
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -4,14 +4,9 @@ tags:
 
 ---
 
-- clearState
-- launchApp
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

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
@@ -4,14 +4,9 @@ tags:
 
 ---
 
-- clearState
-- launchApp
+# Set up 
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/browser_features/opening_tabs.yaml b/.maestro/browser_features/opening_tabs.yaml
@@ -5,15 +5,9 @@ tags:
 
 ---
 
-# Set up
-- clearState
-- launchApp
-- runFlow:
-    when:
-      visible:
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+# Set up 
+- runFlow: 
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/browser_features/search_bar.yaml b/.maestro/browser_features/search_bar.yaml
@@ -5,15 +5,9 @@ tags:
 
 ---
 
-# Set up
-- clearState
-- launchApp
-- runFlow:
-    when:
-      visible:
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+# Set up 
+- runFlow: 
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/browser_features/swipe_tabs.yaml b/.maestro/browser_features/swipe_tabs.yaml
@@ -5,15 +5,9 @@ tags:
 
 ---
 
-# Set up
-- clearState
-- launchApp
-- runFlow:
-    when:
-      visible:
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+# Set up 
+- runFlow: 
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/data_clearing_tests/01_fire_proofing.yml b/.maestro/data_clearing_tests/01_fire_proofing.yml
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/data_clearing_tests/02_duckduckgo_settings.yml b/.maestro/data_clearing_tests/02_duckduckgo_settings.yml
@@ -5,15 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearKeychain
-- clearState
-- launchApp
-- runFlow:
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+- runFlow: 
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/privacy_tests/01_single-site_single-tab_session.yaml b/.maestro/privacy_tests/01_single-site_single-tab_session.yaml
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/privacy_tests/02_single-site_new_tab_session.yaml b/.maestro/privacy_tests/02_single-site_new_tab_session.yaml
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/privacy_tests/03_single-site_new-tab_session_variant_two.yaml b/.maestro/privacy_tests/03_single-site_new-tab_session_variant_two.yaml
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible:

diff --git a/.maestro/privacy_tests/04_single-site_multi-tab_session.yaml b/.maestro/privacy_tests/04_single-site_multi-tab_session.yaml
@@ -5,14 +5,8 @@ tags:
 ---
 
 # Set up 
-- clearState
-- launchApp
 - runFlow: 
-    when: 
-      visible: 
-        text: "Let’s Do It!"
-        index: 0
-    file: ../shared/onboarding.yaml
+    file: ../shared/setup.yaml
 
 # Load Site
 - assertVisible: