Merge branch 'release/5.203.0' into main

duckduckgo · Jun 4, 2024 · 7bfffff · 7bfffff
2 parents 716cbef + 4c34c19
commit 7bfffff
Show file tree

Hide file tree

Showing 162 changed files with 2,103 additions and 3,050 deletions.
diff --git a/...ion_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml b/...ion_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-10"
 - tapOn:

diff --git a/...ng-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)_(u3_not_needed).yaml b/...ng-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)_(u3_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-11"
 - tapOn:

diff --git a/...-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)__(dsl_not_needed).yaml b/...-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)__(dsl_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-12"
 - tapOn:

diff --git a/...t_it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)_(u3_not_needed).yaml b/...t_it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)_(u3_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-13"
 - tapOn:

diff --git a/...it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)__(dsl_not_needed).yaml b/...it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)__(dsl_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-14"
 - tapOn:

diff --git a/...o/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml b/...o/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-1"
 - tapOn:
@@ -38,7 +38,7 @@ tags:
 - assertVisible:
     text: "convert.ad-company.site"
 - assertVisible:
-      text: "ad-company.site"
+    text: "ad-company.site"
 - action: back
 - assertVisible:
     text: "View Non-Tracker Companies"

diff --git a/.../ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml b/.../ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-2"
 - tapOn:

diff --git a/...d_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml b/...d_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-3"
 - tapOn:

diff --git a/..._click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml b/..._click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-4"
 - tapOn:

diff --git a/...ck_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml b/...ck_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-5"
 - tapOn:

diff --git a/...k_detection_flows/6_-_m.js_heuristic;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml b/...k_detection_flows/6_-_m.js_heuristic;_ad_domain_provided,_but_empty_(dsl_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -11,12 +11,6 @@ tags:
 - pressKey: Enter
 - assertVisible:
     text: ".*Got It.*"
-- tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
-- tapOn:
-    text: "HIDE TIPS FOREVER"
 - assertVisible:
     id: "ad-id-6"
 - tapOn:

diff --git a/.../ad_click_detection_flows/7_-_y.js_bing-provided;_ad_domain_provided_(u3_not_needed).yaml b/.../ad_click_detection_flows/7_-_y.js_bing-provided;_ad_domain_provided_(u3_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-7"
 - tapOn:

diff --git a/...ad_click_detection_flows/8_-_m.js_bing-provided;_ad_domain_provided_(dsl_not_needed).yaml b/...ad_click_detection_flows/8_-_m.js_bing-provided;_ad_domain_provided_(dsl_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-8"
 - tapOn:

diff --git a/...ction_flows/9_-_y.js_bing-provided;_ad_domain_provided_but_incorrect_(u3_not_needed).yaml b/...ction_flows/9_-_y.js_bing-provided;_ad_domain_provided_but_incorrect_(u3_not_needed).yaml
@@ -1,6 +1,6 @@
 appId: com.duckduckgo.mobile.android
 tags:
-    - adClickTest
+  - adClickTest
 ---
 - launchApp:
     clearState: true
@@ -12,11 +12,11 @@ tags:
 - assertVisible:
     text: ".*Got It.*"
 - tapOn:
-    text: "HIDE"
-- assertVisible:
-    text: "HIDE TIPS FOREVER"
+    text: "Got It"
+- tapOn:
+    id: "com.duckduckgo.mobile.android:id/fireIconMenu"
 - tapOn:
-    text: "HIDE TIPS FOREVER"
+    text: "Cancel"
 - assertVisible:
     id: "ad-id-9"
 - tapOn:

diff --git a/.maestro/ads_preview_flows/1-_design-system-components.yaml b/.maestro/ads_preview_flows/1-_design-system-components.yaml
@@ -66,7 +66,7 @@ tags:
 - tapOn:
     id: "com.duckduckgo.mobile.android:id/primaryCta"
 - tapOn: "LAYOUTS"
-- tapOn: "Primary"
+- assertVisible: "Expandable Layout"
 - tapOn: "INTERACTIVE"
 - tapOn:
     id: "com.duckduckgo.mobile.android:id/switch_one"

diff --git a/.maestro/custom_tabs/custom_tabs_navigation.yaml b/.maestro/custom_tabs/custom_tabs_navigation.yaml
@@ -8,16 +8,20 @@ tags:
     stopApp: true
 
 - assertVisible:
-    text: ".*Not to worry! Searching and browsing privately.*"
+    text: ".*Ready for a better, more private internet?.*"
 - tapOn: "let's do it!"
+- assertVisible:
+    text: ".*Privacy protections activated.*"
+- tapOn: "choose your browser"
 - runFlow:
     when:
       visible: "set as default"
     commands:
       - tapOn: "duckduckgo"
       - tapOn: "set as default"
       - assertVisible:
-          text: ".*I'll also upgrade the security of your connection if possible.*"
+          text: ".*Awesome! Welcome to the duck side.*"
+      - tapOn: "start browsing"
 
 - tapOn:
     id: "com.duckduckgo.mobile.android:id/browserMenuImageView"

diff --git a/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml b/.maestro/custom_tabs/custom_tabs_navigation_new_tab.yaml
@@ -8,16 +8,20 @@ tags:
     stopApp: true
 
 - assertVisible:
-    text: ".*Not to worry! Searching and browsing privately.*"
+    text: ".*Ready for a better, more private internet?.*"
 - tapOn: "let's do it!"
+- assertVisible:
+    text: ".*Privacy protections activated.*"
+- tapOn: "choose your browser"
 - runFlow:
     when:
       visible: "set as default"
     commands:
       - tapOn: "duckduckgo"
       - tapOn: "set as default"
       - assertVisible:
-          text: ".*I'll also upgrade the security of your connection if possible.*"
+          text: ".*Awesome! Welcome to the duck side.*"
+      - tapOn: "start browsing"
 
 - tapOn:
     id: "com.duckduckgo.mobile.android:id/browserMenuImageView"