Skip to content

Commit 77cc776

Browse files
github-actions[bot]github-actions[bot]
committed
Merge branch 'release/5.223.0'
2 parents 0f7a163 + fa40729 commit 77cc776

File tree

399 files changed

+10251
-5811
lines changed

Some content is hidden

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

399 files changed

+10251
-5811
lines changed

‎.github/workflows/action-pr-approved.yaml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.github/workflows/end-to-end-robintest.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,15 @@ jobs:
115115
timeout: 120
116116
app-file: apk/release.apk
117117
android-api-level: 33
118-
workspace: .maestro/notifications_permissions_android13_plus
118+
workspace: .maestro/notifications_permissions_android13_plus
119+
120+
- name: Create Asana task when workflow failed
121+
if: ${{ failure() }}
122+
uses: honeycombio/gha-create-asana-task@main
123+
with:
124+
asana-secret: ${{ secrets.GH_ASANA_SECRET }}
125+
asana-workspace-id: ${{ secrets.GH_ASANA_WORKSPACE_ID }}
126+
asana-project-id: ${{ secrets.GH_ASANA_AOR_PROJECT_ID }}
127+
asana-section-id: ${{ secrets.GH_ASANA_INCOMING_ID }}
128+
asana-task-name: GH Workflow Failure - End to end tests (Robin)
129+
asana-task-description: The end to end workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }}

‎.github/workflows/pr-review-notifications.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Pull Request Reviewed -> Sync With Asana
2+
3+
on:
4+
pull_request_review:
5+
types: [submitted]
6+
7+
jobs:
8+
pr-reviewed:
9+
name: Add PR reviewed comment
10+
uses: duckduckgo/native-github-asana-sync/.github/workflows/[email protected]
11+
with:
12+
trigger-phrase: "Task/Issue URL:"
13+
secrets:
14+
asana_pat: ${{ secrets.GH_ASANA_SECRET }}

‎.maestro/ad_click_detection_flows/10_-_m.js_bing-provided_ad_domain_provided_but_incorrect_dsl_not_needed.yaml‎

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,52 @@ appId: com.duckduckgo.mobile.android
22
tags:
33
- adClickTest
44
---
5-
- launchApp:
6-
clearState: true
5+
- retry:
6+
maxRetries: 3
7+
commands:
8+
- launchApp:
9+
clearState: true
710

8-
- runFlow: ../shared/onboarding.yaml
11+
- runFlow: ../shared/onboarding.yaml
912

10-
- inputText: "https://www.search-company.site/#ad-id-10"
11-
- pressKey: Enter
12-
- assertVisible:
13-
text: ".*Got It.*"
14-
- tapOn:
15-
text: "Got It"
16-
- tapOn:
17-
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
18-
- tapOn:
19-
text: "Cancel"
20-
- assertVisible:
21-
id: "ad-id-10"
22-
- tapOn:
23-
id: "ad-id-10"
24-
- assertVisible:
25-
text: "Publisher site"
26-
- tapOn:
27-
id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
28-
- assertVisible:
29-
text: "View Tracker Companies"
30-
- tapOn:
31-
text: "View Tracker Companies"
32-
- assertVisible:
33-
text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
34-
- assertVisible:
35-
text: "About our Web Tracking Protections"
36-
- assertVisible:
37-
text: ".*Ad Company"
38-
- assertVisible:
39-
text: "convert.ad-company.site"
40-
- assertVisible:
41-
text: "ad-company.site"
42-
- action: back
43-
- assertVisible:
44-
text: "View Non-Tracker Companies"
45-
- tapOn:
46-
text: "View Non-Tracker Companies"
47-
- assertVisible:
48-
text: "We did not identify any requests from third-party domains."
49-
- assertVisible:
50-
text: "About our Web Tracking Protections"
13+
- inputText: "https://www.search-company.site/#ad-id-10"
14+
- pressKey: Enter
15+
- assertVisible:
16+
text: ".*Got It.*"
17+
- tapOn:
18+
text: "Got It"
19+
- tapOn:
20+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
21+
- tapOn:
22+
text: "Cancel"
23+
- assertVisible:
24+
id: "ad-id-10"
25+
- tapOn:
26+
id: "ad-id-10"
27+
- assertVisible:
28+
text: "Publisher site"
29+
- tapOn:
30+
id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
31+
- assertVisible:
32+
text: "View Tracker Companies"
33+
- tapOn:
34+
text: "View Tracker Companies"
35+
- assertVisible:
36+
text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
37+
- assertVisible:
38+
text: "About our Web Tracking Protections"
39+
- assertVisible:
40+
text: ".*Ad Company"
41+
- assertVisible:
42+
text: "convert.ad-company.site"
43+
- assertVisible:
44+
text: "ad-company.site"
45+
- action: back
46+
- assertVisible:
47+
text: "View Non-Tracker Companies"
48+
- tapOn:
49+
text: "View Non-Tracker Companies"
50+
- assertVisible:
51+
text: "We did not identify any requests from third-party domains."
52+
- assertVisible:
53+
text: "About our Web Tracking Protections"

‎.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: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,58 @@ appId: com.duckduckgo.mobile.android
22
tags:
33
- adClickTest
44
---
5-
- launchApp:
6-
clearState: true
5+
- retry:
6+
maxRetries: 3
7+
commands:
8+
- launchApp:
9+
clearState: true
710

8-
- runFlow: ../shared/onboarding.yaml
11+
- runFlow: ../shared/onboarding.yaml
912

10-
- inputText: "https://www.search-company.site/#ad-id-11"
11-
- pressKey: Enter
12-
- assertVisible:
13-
text: ".*Got It.*"
14-
- tapOn:
15-
text: "Got It"
16-
- tapOn:
17-
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
18-
- tapOn:
19-
text: "Cancel"
20-
- assertVisible:
21-
id: "ad-id-11"
22-
- tapOn:
23-
id: "ad-id-11"
24-
- assertVisible:
25-
text: "Publisher site"
26-
- tapOn:
27-
id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
28-
- assertVisible:
29-
text: "View Tracker Companies"
30-
- tapOn:
31-
text: "View Tracker Companies"
32-
- assertVisible:
33-
text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
34-
- assertVisible:
35-
text: "About our Web Tracking Protections"
36-
- assertVisible:
37-
text: ".*Ad Company"
38-
- assertVisible:
39-
text: "ad-company.site"
40-
- action: back
41-
- assertVisible:
42-
text: "View Non-Tracker Companies"
43-
- tapOn:
44-
text: "View Non-Tracker Companies"
45-
- assertVisible:
46-
text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
47-
- assertVisible:
48-
text: "About our Web Tracking Protections"
49-
- assertVisible:
50-
text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
51-
- assertVisible:
52-
text: "How our search ads impact our protections"
53-
- assertVisible:
54-
text: ".*Ad Company"
55-
- assertVisible:
56-
text: "convert.ad-company.site"
13+
- inputText: "https://www.search-company.site/#ad-id-11"
14+
- pressKey: Enter
15+
- assertVisible:
16+
text: ".*Got It.*"
17+
- tapOn:
18+
text: "Got It"
19+
- tapOn:
20+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
21+
- tapOn:
22+
text: "Cancel"
23+
- assertVisible:
24+
id: "ad-id-11"
25+
- tapOn:
26+
id: "ad-id-11"
27+
- assertVisible:
28+
text: "Publisher site"
29+
- tapOn:
30+
id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
31+
- assertVisible:
32+
text: "View Tracker Companies"
33+
- tapOn:
34+
text: "View Tracker Companies"
35+
- assertVisible:
36+
text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
37+
- assertVisible:
38+
text: "About our Web Tracking Protections"
39+
- assertVisible:
40+
text: ".*Ad Company"
41+
- assertVisible:
42+
text: "ad-company.site"
43+
- action: back
44+
- assertVisible:
45+
text: "View Non-Tracker Companies"
46+
- tapOn:
47+
text: "View Non-Tracker Companies"
48+
- assertVisible:
49+
text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
50+
- assertVisible:
51+
text: "About our Web Tracking Protections"
52+
- assertVisible:
53+
text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
54+
- assertVisible:
55+
text: "How our search ads impact our protections"
56+
- assertVisible:
57+
text: ".*Ad Company"
58+
- assertVisible:
59+
text: "convert.ad-company.site"

‎.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: 53 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,58 @@ appId: com.duckduckgo.mobile.android
22
tags:
33
- adClickTest
44
---
5-
- launchApp:
6-
clearState: true
5+
- retry:
6+
maxRetries: 3
7+
commands:
8+
- launchApp:
9+
clearState: true
710

8-
- runFlow: ../shared/onboarding.yaml
11+
- runFlow: ../shared/onboarding.yaml
912

10-
- inputText: "https://www.search-company.site/#ad-id-12"
11-
- pressKey: Enter
12-
- assertVisible:
13-
text: ".*Got It.*"
14-
- tapOn:
15-
text: "Got It"
16-
- tapOn:
17-
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
18-
- tapOn:
19-
text: "Cancel"
20-
- assertVisible:
21-
id: "ad-id-12"
22-
- tapOn:
23-
id: "ad-id-12"
24-
- assertVisible:
25-
text: "Publisher site"
26-
- tapOn:
27-
id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
28-
- assertVisible:
29-
text: "View Tracker Companies"
30-
- tapOn:
31-
text: "View Tracker Companies"
32-
- assertVisible:
33-
text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
34-
- assertVisible:
35-
text: "About our Web Tracking Protections"
36-
- assertVisible:
37-
text: ".*Ad Company"
38-
- assertVisible:
39-
text: "ad-company.site"
40-
- action: back
41-
- assertVisible:
42-
text: "View Non-Tracker Companies"
43-
- tapOn:
44-
text: "View Non-Tracker Companies"
45-
- assertVisible:
46-
text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
47-
- assertVisible:
48-
text: "About our Web Tracking Protections"
49-
- assertVisible:
50-
text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
51-
- assertVisible:
52-
text: "How our search ads impact our protections"
53-
- assertVisible:
54-
text: ".*Ad Company"
55-
- assertVisible:
56-
text: "convert.ad-company.site"
13+
- inputText: "https://www.search-company.site/#ad-id-12"
14+
- pressKey: Enter
15+
- assertVisible:
16+
text: ".*Got It.*"
17+
- tapOn:
18+
text: "Got It"
19+
- tapOn:
20+
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
21+
- tapOn:
22+
text: "Cancel"
23+
- assertVisible:
24+
id: "ad-id-12"
25+
- tapOn:
26+
id: "ad-id-12"
27+
- assertVisible:
28+
text: "Publisher site"
29+
- tapOn:
30+
id: "com.duckduckgo.mobile.android:id/omnibarIconContainer"
31+
- assertVisible:
32+
text: "View Tracker Companies"
33+
- tapOn:
34+
text: "View Tracker Companies"
35+
- assertVisible:
36+
text: "The following third-party domains’ requests were blocked from loading because they were identified as tracking requests. If a company's requests are loaded, it can allow them to profile you."
37+
- assertVisible:
38+
text: "About our Web Tracking Protections"
39+
- assertVisible:
40+
text: ".*Ad Company"
41+
- assertVisible:
42+
text: "ad-company.site"
43+
- action: back
44+
- assertVisible:
45+
text: "View Non-Tracker Companies"
46+
- tapOn:
47+
text: "View Non-Tracker Companies"
48+
- assertVisible:
49+
text: "The following third-party domains’ requests were loaded. If a company's requests are loaded, it can allow them to profile you, though our other web tracking protections still apply."
50+
- assertVisible:
51+
text: "About our Web Tracking Protections"
52+
- assertVisible:
53+
text: "The following domain’s requests were loaded because a publisher-company.site ad on DuckDuckGo was recently clicked. These requests help evaluate ad effectiveness. All ads on DuckDuckGo are non-profiling."
54+
- assertVisible:
55+
text: "How our search ads impact our protections"
56+
- assertVisible:
57+
text: ".*Ad Company"
58+
- assertVisible:
59+
text: "convert.ad-company.site"

0 commit comments

Comments
 (0)