Skip to content

Commit 7bfffff

Browse files
daxtheduckdaxtheduck
committed
Merge branch 'release/5.203.0' into main
2 parents 716cbef + 4c34c19 commit 7bfffff

File tree

162 files changed

+2103
-3050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+2103
-3050
lines changed

‎.maestro/ad_click_detection_flows/10_-_m.js_bing-provided;_ad_domain_provided_but_incorrect_(dsl_not_needed).yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-10"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/11_-_y.js_bing-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)_(u3_not_needed).yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-11"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/12_-_m.js_bing-provided;_ad_domain_provided_but_it's_not_a_domain_(i.e.,_abcedf)__(dsl_not_needed).yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-12"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/13_-_y.js_bing-provided;_ad_domain_provided_but_it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)_(u3_not_needed).yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-13"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/14_-_m.js_bing-provided;_ad_domain_provided_but_it's_a_subdomain_of_advertiser_(i.e.,_foo.www.search-company-site)__(dsl_not_needed).yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-14"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/1_-_y.js_heuristic;_no_ad_domain_param;_u3_param_included.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-1"
2222
- tapOn:
@@ -38,7 +38,7 @@ tags:
3838
- assertVisible:
3939
text: "convert.ad-company.site"
4040
- assertVisible:
41-
text: "ad-company.site"
41+
text: "ad-company.site"
4242
- action: back
4343
- assertVisible:
4444
text: "View Non-Tracker Companies"

‎.maestro/ad_click_detection_flows/2_-_m.js_heuristic;_no_ad_domain_param;_dsl_param_included.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-2"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/3_-_y.js_heuristic;_no_ad_domain_param,_but_missing_u3_param.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-3"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/4_-_m.js_heuristic;_no_ad_domain_param,_but_missing_dsl_param.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-4"
2222
- tapOn:

‎.maestro/ad_click_detection_flows/5_-_y.js_heuristic;_ad_domain_provided,_but_empty_(u3_not_needed).yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appId: com.duckduckgo.mobile.android
22
tags:
3-
- adClickTest
3+
- adClickTest
44
---
55
- launchApp:
66
clearState: true
@@ -12,11 +12,11 @@ tags:
1212
- assertVisible:
1313
text: ".*Got It.*"
1414
- tapOn:
15-
text: "HIDE"
16-
- assertVisible:
17-
text: "HIDE TIPS FOREVER"
15+
text: "Got It"
16+
- tapOn:
17+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
1818
- tapOn:
19-
text: "HIDE TIPS FOREVER"
19+
text: "Cancel"
2020
- assertVisible:
2121
id: "ad-id-5"
2222
- tapOn:

0 commit comments

Comments
 (0)