Skip to content

Commit

Permalink
Merge branch 'release/5.186.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daxtheduck committed Jan 29, 2024
2 parents 97e8850 + 1762424 commit eda28dc
Show file tree
Hide file tree
Showing 364 changed files with 10,304 additions and 2,279 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/action-issue-opened.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Create Asana task
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: '414730916066338'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/action-pr-approved.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Update Asana task -> PR approved
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
trigger-phrase: "Task/Issue URL:"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/action-pr-merged.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
add-pr-merged-comment:
runs-on: ubuntu-latest
steps:
- uses: duckduckgo/native-github-asana-sync@v1.0
- uses: duckduckgo/native-github-asana-sync@v1.1
if: github.event.pull_request.merged
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/action-pr-opened.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
issues: write
steps:
- name: Add comment in Asana task
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
trigger-phrase: "Task/Issue URL:"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

unit_tests:
name: Unit tests
runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
runs-on: android-large-runner

steps:
- name: Checkout repository
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:

lint:
name: Lint
runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
runs-on: android-large-runner

steps:
- name: Checkout repository
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
path: lint-report.zip

android_tests:
runs-on: ubuntu-20.04 #https://github.com/actions/runner-images/issues/6709
runs-on: android-large-runner
name: Android CI tests

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sync-critical-path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
jobs:
instrumentation_tests:
runs-on: ubuntu-latest
name: End-to-End tests
name: Sync Feature Critical Path End-to-End tests

steps:
- name: Checkout repository
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Create Asana task when workflow failed
if: ${{ failure() }}
id: create-failure-task
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
Expand All @@ -86,7 +86,7 @@ jobs:

- name: Add Asana task to Browser Sync & Backup project
if: ${{ failure() }}
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_BROWSER_SYNC_BACKUP_PROJECT_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Create Asana task when workflow failed
if: ${{ failure() }}
id: create-failure-task
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
Expand All @@ -77,7 +77,7 @@ jobs:

- name: Add Asana task to Browser Sync & Backup project
if: ${{ failure() }}
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_BROWSER_SYNC_BACKUP_PROJECT_ID }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/update-content-scope.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Create Asana task in Android App project
if: ${{ steps.update-check.outcome == 'failure' }}
id: create-task
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
Expand All @@ -92,8 +92,8 @@ jobs:
action: 'create-asana-task'

- name: Add Asana task to Release Board project
if: ${{ steps.update-check.outcome == 'failure' }}
uses: duckduckgo/native-github-asana-sync@v1.0
if: ${{ steps.create-task.outputs.duplicate == 'false' }}
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_RELEASE_BOARD_PROJECT_ID }}
Expand All @@ -102,8 +102,8 @@ jobs:
action: 'add-task-asana-project'

- name: Update PR description with Asana task
if: ${{ steps.update-check.outcome == 'failure' }}
uses: duckduckgo/native-github-asana-sync@v1.0
if: ${{ steps.create-task.outputs.duplicate == 'false' }}
uses: duckduckgo/native-github-asana-sync@v1.1
with:
github-pat: ${{ secrets.GT_DAXMOBILE }}
github-pr: ${{ steps.create-pr.outputs.pull-request-number }}
Expand All @@ -115,7 +115,7 @@ jobs:

- name: Create Asana task when workflow failed
if: ${{ failure() }}
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/update-ref-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Create Asana task in Android App project
if: ${{ steps.update-check.outcome == 'failure' }}
id: create-task
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
Expand All @@ -99,8 +99,8 @@ jobs:
action: 'create-asana-task'

- name: Add Asana task to Release Board project
if: ${{ steps.update-check.outcome == 'failure' }}
uses: duckduckgo/native-github-asana-sync@v1.0
if: ${{ steps.create-task.outputs.duplicate == 'false' }}
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_RELEASE_BOARD_PROJECT_ID }}
Expand All @@ -109,8 +109,8 @@ jobs:
action: 'add-task-asana-project'

- name: Update PR description with Asana task
if: ${{ steps.update-check.outcome == 'failure' }}
uses: duckduckgo/native-github-asana-sync@v1.0
if: ${{ steps.create-task.outputs.duplicate == 'false' }}
uses: duckduckgo/native-github-asana-sync@v1.1
with:
github-pat: ${{ secrets.GT_DAXMOBILE }}
github-pr: ${{ steps.create-pr.outputs.pull-request-number }}
Expand All @@ -122,7 +122,7 @@ jobs:

- name: Create Asana task when workflow failed
if: ${{ failure() }}
uses: duckduckgo/native-github-asana-sync@v1.0
uses: duckduckgo/native-github-asana-sync@v1.1
with:
asana-pat: ${{ secrets.GH_ASANA_SECRET }}
asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
appId: com.duckduckgo.mobile.android
name: "ReleaseTest: Can undo a deleted favorite"
name: "ReleaseTest: Can add favorite from bookmark screen"
tags:
- releaseTest
---
Expand All @@ -20,40 +20,18 @@ tags:
text: "got it"
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- assertVisible:
text: "add bookmark"
- tapOn:
text: "add bookmark"
# Add favorite from edit saved site
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- assertVisible:
text: "edit bookmark"
- tapOn:
text: "edit bookmark"
- assertVisible:
text: "add to favorites"
- tapOn:
text: "add to favorites"
- tapOn:
id: "com.duckduckgo.mobile.android:id/action_confirm_changes"
# Navigate to bookmarks screen
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- assertVisible:
text: "bookmarks"
- tapOn:
text: "bookmarks"
# Remove bookmark from bookmarks screen
# Add favorite from bookmarks screen
- tapOn:
id: "com.duckduckgo.mobile.android:id/trailingIcon"
index: 0
- assertVisible:
text: "Delete"
- tapOn:
text: "delete"
# Undo remove bookmark from bookmarks screen
- tapOn:
id: "com.duckduckgo.mobile.android:id/snackbar_action"
- assertNotVisible:
text: "No bookmarks added yet"
text: "add to favorites"
- assertVisible:
id: "com.duckduckgo.mobile.android:id/favoriteStar"
5 changes: 5 additions & 0 deletions .maestro/shared/open_bookmarks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
appId: com.duckduckgo.mobile.android
---
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- tapOn: "Bookmarks"
6 changes: 2 additions & 4 deletions .maestro/shared/open_sync_screen.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
appId: com.duckduckgo.mobile.android
---
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- tapOn: "Settings"
- tapOn:
id: "com.duckduckgo.mobile.android:id/item_container"
index: 8
- tapOn: "Sync & Backup"
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Test Definition: https://app.asana.com/0/1205017362573508/1205017364481021
appId: com.duckduckgo.mobile.android
name: "ReleaseTest: Sync can create an account"
name: "ReleaseTest: Users can create an account"
tags:
- syncTest
---
Expand Down
18 changes: 18 additions & 0 deletions .maestro/sync_flows/delete_server_data.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Test Definition: https://app.asana.com/0/1205017362573508/1206195332210606
appId: com.duckduckgo.mobile.android
name: "ReleaseTest: Users can remove all data"
tags:
- syncTest
---
- launchApp:
clearState: true
stopApp: true
- runFlow: create_account.yaml
- scrollUntilVisible:
element:
text: "Turn Off and Delete Server Data…"
direction: DOWN
- assertVisible: "Turn Off and Delete Server Data…"
- tapOn: "Turn Off and Delete Server Data…"
- tapOn: "Turn Off"
- assertVisible: "Sync and Back Up This Device"
18 changes: 18 additions & 0 deletions .maestro/sync_flows/recover_account.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Test Definition: https://app.asana.com/0/1205017362573508/1205044961533553/f
# Test Definition: https://app.asana.com/0/1205017362573508/1205044961533551/f
appId: com.duckduckgo.mobile.android
name: "ReleaseTest: Users can recover an account / Device can be added to an account"
tags:
- syncTest
---
- launchApp:
clearState: true
stopApp: true
- runFlow: create_account.yaml
- tapOn: "Show Text Code"
- copyTextFrom:
id: "com.duckduckgo.mobile.android:id/recoveryCode"
- tapOn: "Navigate up"
- tapOn: "Turn Off Sync & Backup…"
- tapOn: "Turn Off"
- runFlow: ../sync_flows/steps/action_recover_account.yaml
69 changes: 69 additions & 0 deletions .maestro/sync_flows/steps/action_add_bookmarks_and_folders.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Expected state: Browser screen
appId: com.duckduckgo.mobile.android
---
- runScript: script_add_bookmark_domains.js
# Until here we've joined an account that has predefined data
# Now, we add a couple bookmarks
- tapOn: "Search or type URL"
- inputText: "${output.bookmarks.domains[0]}"
# We need this because Dax Dialogs sometimes appears before pressing Enter
- runFlow:
when:
visible:
id: "com.duckduckgo.mobile.android:id/primaryCta"
commands:
- tapOn:
id: "com.duckduckgo.mobile.android:id/primaryCta"
- pressKey: Enter
- runFlow:
when:
visible:
id: "com.duckduckgo.mobile.android:id/primaryCta"
commands:
- tapOn:
id: "com.duckduckgo.mobile.android:id/primaryCta"
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- tapOn: "Add Bookmark"
- tapOn: "Search or type URL"
# Now, we add a favourite
- inputText: "${output.bookmarks.domains[1]}"
- pressKey: Enter
- tapOn:
id: "com.duckduckgo.mobile.android:id/browserMenuImageView"
- tapOn: "Add Bookmark"
- tapOn:
id: "com.duckduckgo.mobile.android:id/bookmarksBottomSheetSwitch"
- runFlow:
when:
visible:
id: "com.duckduckgo.mobile.android:id/dialogTextCta"
commands:
- tapOn:
id: "com.duckduckgo.mobile.android:id/item_container"
index: 1
- tapOn:
id: "com.duckduckgo.mobile.android:id/touch_outside"
# Now, we create a new folder
- runFlow: ../../shared/open_bookmarks.yaml
- tapOn: "Add Folder"
- tapOn: "Title"
- inputText: "${output.bookmarks.folders[0]}"
- tapOn: "Confirm"
# Move first item to newly created folder
- tapOn:
id: "com.duckduckgo.mobile.android:id/trailingIcon"
index: 1
- tapOn: "Edit"
- tapOn: "Bookmarks"
- tapOn: "${output.bookmarks.folders[0]}"
- tapOn: "Confirm"
- tapOn: "Navigate up"
- runFlow:
when:
visible:
id: "com.duckduckgo.mobile.android:id/dialogTextCta"
commands:
- tapOn:
id: "com.duckduckgo.mobile.android:id/item_container"
index: 1
Loading

0 comments on commit eda28dc

Please sign in to comment.