Skip to content

Commit 8b254e5

Browse files
github-actions[bot]github-actions[bot]
committed
Merge branch 'release/5.229.0'
2 parents 20af100 + 322803b commit 8b254e5

File tree

481 files changed

+63434
-66925
lines changed

Some content is hidden

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

481 files changed

+63434
-66925
lines changed

‎.github/workflows/e2e-nightly-autofill.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: gradle/actions/setup-gradle@v3
4949

5050
- name: Assemble APK which does not require auth to use Autofill
51-
run: ./gradlew assemblePlayRelease -Pautofill-disable-auth-requirement -Pforce-default-variant -x lint
51+
run: ./gradlew assemblePlayRelease -Pautofill-disable-auth-requirement -Pforce-default-variant -Pskip-onboarding -x lint
5252

5353
- name: Move APK to new folder
5454
if: always()

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,25 @@ jobs:
4848
uses: gradle/actions/setup-gradle@v3
4949

5050
- name: Assemble release APK
51-
run: ./gradlew assemblePlayRelease -Pforce-default-variant
51+
run: ./gradlew assemblePlayRelease -Pforce-default-variant -Pskip-onboarding
5252

5353
- name: Move APK to new folder
5454
if: always()
5555
run: find . -name "*.apk" -exec mv '{}' apk/release.apk \;
5656

57+
- name: Onboarding flows
58+
uses: mobile-dev-inc/[email protected]
59+
timeout-minutes: 120
60+
with:
61+
api-key: ${{ secrets.ROBIN_API_KEY }}
62+
project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
63+
name: onboardingTest_${{ github.sha }}
64+
timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
65+
app-file: apk/release.apk
66+
android-api-level: 30
67+
workspace: .maestro
68+
include-tags: onboardingTest
69+
5770
- name: Ad click detection flows
5871
uses: mobile-dev-inc/[email protected]
5972
timeout-minutes: 120
@@ -120,7 +133,8 @@ jobs:
120133
timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
121134
app-file: apk/release.apk
122135
android-api-level: 33
123-
workspace: .maestro/notifications_permissions_android13_plus
136+
workspace: .maestro
137+
include-tags: permissionsTest
124138

125139
- name: Create Asana task when workflow failed
126140
if: ${{ failure() }}

‎.github/workflows/privacy-dashboard-end-to-end.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: gradle/actions/setup-gradle@v3
5252

5353
- name: Assemble the project
54-
run: ./gradlew assemblePlayRelease -Pforce-default-variant
54+
run: ./gradlew assemblePlayRelease -Pforce-default-variant -Pskip-onboarding
5555

5656
- name: Move APK to new folder
5757
if: always()

‎.github/workflows/release_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: gradle/actions/setup-gradle@v3
5656

5757
- name: Assemble release APK
58-
run: ./gradlew assemblePlayRelease -Pforce-default-variant
58+
run: ./gradlew assemblePlayRelease -Pforce-default-variant -Pskip-onboarding
5959

6060
- name: Move APK to new folder
6161
if: always()

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ report
9595
!/node_modules/@duckduckgo/content-scope-scripts/build/
9696
/node_modules/@duckduckgo/content-scope-scripts/build/*
9797
!/node_modules/@duckduckgo/content-scope-scripts/build/android/
98-
/node_modules/@duckduckgo/content-scope-scripts/build/android/*
9998
!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/
10099
/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/*
101-
!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/duckplayer/
102-
!/node_modules/@duckduckgo/content-scope-scripts/build/android/contentScope.js
103-
!/node_modules/@duckduckgo/content-scope-scripts/build/android/autofillPasswordImport.js
100+
!/node_modules/@duckduckgo/content-scope-scripts/build/android/pages/duckplayer/

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ tags:
88
- launchApp:
99
clearState: true
1010

11-
- runFlow: ../shared/pre_onboarding.yaml
11+
- runFlow: ../shared/skip_all_onboarding.yaml
1212

1313
- inputText: "https://www.search-company.site/#ad-id-10"
1414
- pressKey: Enter
15-
- assertVisible:
16-
text: ".*Got It.*"
17-
- tapOn:
18-
text: "Got It"
15+
1916
- tapOn:
2017
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
2118
- 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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ tags:
88
- launchApp:
99
clearState: true
1010

11-
- runFlow: ../shared/pre_onboarding.yaml
11+
- runFlow: ../shared/skip_all_onboarding.yaml
1212

1313
- inputText: "https://www.search-company.site/#ad-id-11"
1414
- pressKey: Enter
15-
- assertVisible:
16-
text: ".*Got It.*"
17-
- tapOn:
18-
text: "Got It"
15+
1916
- tapOn:
2017
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
2118
- 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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ tags:
88
- launchApp:
99
clearState: true
1010

11-
- runFlow: ../shared/pre_onboarding.yaml
11+
- runFlow: ../shared/skip_all_onboarding.yaml
1212

1313
- inputText: "https://www.search-company.site/#ad-id-12"
1414
- pressKey: Enter
15-
- assertVisible:
16-
text: ".*Got It.*"
17-
- tapOn:
18-
text: "Got It"
15+
1916
- tapOn:
2017
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
2118
- 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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ tags:
88
- launchApp:
99
clearState: true
1010

11-
- runFlow: ../shared/pre_onboarding.yaml
11+
- runFlow: ../shared/skip_all_onboarding.yaml
1212

1313
- inputText: "https://www.search-company.site/#ad-id-13"
1414
- pressKey: Enter
15-
- assertVisible:
16-
text: ".*Got It.*"
17-
- tapOn:
18-
text: "Got It"
15+
1916
- tapOn:
2017
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
2118
- 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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ tags:
88
- launchApp:
99
clearState: true
1010

11-
- runFlow: ../shared/pre_onboarding.yaml
11+
- runFlow: ../shared/skip_all_onboarding.yaml
1212

1313
- inputText: "https://www.search-company.site/#ad-id-14"
1414
- pressKey: Enter
15-
- assertVisible:
16-
text: ".*Got It.*"
17-
- tapOn:
18-
text: "Got It"
15+
1916
- tapOn:
2017
id: "com.duckduckgo.mobile.android:id/fireIconMenu"
2118
- tapOn:

0 commit comments

Comments
 (0)