Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit 8f4a97f

Browse files
jonathanKingstonjonathanKingston
committed
Merge remote-tracking branch 'origin/main' into jkt/shared-web-tests
2 parents 2fd77ec + 4191990 commit 8f4a97f

File tree

96 files changed

+3123
-1054
lines changed

Some content is hidden

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

96 files changed

+3123
-1054
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ jobs:
102102
ios-version: 17
103103
fail-on-timeout: true
104104

105-
# notify-failure:
106-
# name: Notify on failure
107-
# if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref_name == 'main' }}
108-
# needs: [build-end-to-end-tests, end-to-end-tests]
109-
# runs-on: ubuntu-latest
105+
notify-failure:
106+
name: Notify on failure
107+
if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref_name == 'main' }}
108+
needs: [build-end-to-end-tests, end-to-end-tests]
109+
runs-on: ubuntu-latest
110110

111-
# steps:
112-
# - name: Create Asana task when workflow failed
113-
# run: |
114-
# curl -s "https://app.asana.com/api/1.0/tasks" \
115-
# --header "Accept: application/json" \
116-
# --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
117-
# --header "Content-Type: application/json" \
118-
# --data ' { "data": { "name": "GH Workflow Failure - End to end tests", "workspace": "${{ vars.ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}. For instructions on how to handle the failure(s), check https://app.asana.com/0/0/1206423571874502/f" } }'
111+
steps:
112+
- name: Create Asana task when workflow failed
113+
run: |
114+
curl -s "https://app.asana.com/api/1.0/tasks" \
115+
--header "Accept: application/json" \
116+
--header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
117+
--header "Content-Type: application/json" \
118+
--data ' { "data": { "name": "GH Workflow Failure - End to end tests", "workspace": "${{ vars.ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}. For instructions on how to handle the failure(s), check https://app.asana.com/0/0/1206423571874502/f" } }'

‎.github/workflows/ios-sync-end-to-end.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,17 @@ jobs:
119119
120120
121121

122-
# notify-failure:
123-
# name: Notify on failure
124-
# if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref_name == 'main' }}
125-
# needs: [build-for-sync-end-to-end-tests, sync-end-to-end-tests]
126-
# runs-on: ubuntu-latest
127-
128-
# steps:
129-
# - name: Create Asana task when workflow failed
130-
# run: |
131-
# curl -s "https://app.asana.com/api/1.0/tasks" \
132-
# --header "Accept: application/json" \
133-
# --header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
134-
# --header "Content-Type: application/json" \
135-
# --data ' { "data": { "name": "GH Workflow Failure - Sync End to end tests", "workspace": "${{ vars.ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}" } }'
122+
notify-failure:
123+
name: Notify on failure
124+
if: ${{ always() && contains(join(needs.*.result, ','), 'failure') && github.ref_name == 'main' }}
125+
needs: [build-for-sync-end-to-end-tests, sync-end-to-end-tests]
126+
runs-on: ubuntu-latest
127+
128+
steps:
129+
- name: Create Asana task when workflow failed
130+
run: |
131+
curl -s "https://app.asana.com/api/1.0/tasks" \
132+
--header "Accept: application/json" \
133+
--header "Authorization: Bearer ${{ secrets.ASANA_ACCESS_TOKEN }}" \
134+
--header "Content-Type: application/json" \
135+
--data ' { "data": { "name": "GH Workflow Failure - Sync End to end tests", "workspace": "${{ vars.ASANA_WORKSPACE_ID }}", "projects": [ "${{ vars.GH_ASANA_IOS_APP_PROJECT_ID }}" ], "notes" : "The end to end workflow has failed. See https://github.com/duckduckgo/iOS/actions/runs/${{ github.run_id }}" } }'

‎.maestro/browser_features/state_restoration.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ tags:
1818
- pressKey: Enter
1919

2020
# Create navigation stack
21-
- assertVisible: "English"
22-
- tapOn: "English"
21+
- assertVisible: 'English.*'
22+
- tapOn:
23+
text: 'English.*'
24+
childOf: "Top languages, navigation"
2325
- assertVisible: "Welcome to Wikipedia.*"
2426
- tapOn: "Wikipedia"
2527
- assertVisible: "Article"

‎.maestro/browser_features/swipe_tabs.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ tags:
2121

2222
# Open New Tab
2323
- tapOn: "Tab Switcher"
24-
- tapOn:
25-
id: Add
24+
- tapOn: "New Tab"
2625

2726
# Perform a search
2827
- assertVisible:

‎.maestro/privacy_tests/06_multi-tab.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ tags:
5858
text: "Publisher site"
5959
- assertVisible: Tab Switcher
6060
- tapOn: Tab Switcher
61-
- assertVisible:
62-
id: "Add"
63-
- tapOn:
64-
id: "Add"
61+
- assertVisible: "New Tab"
62+
- tapOn: "New Tab"
6563
- assertVisible:
6664
id: "searchEntry"
6765
- tapOn:

‎.maestro/privacy_tests/10_expired_certificate.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ tags:
1717
- inputText: "https://expired.badssl.com"
1818
- pressKey: Enter
1919
- assertVisible: "Warning: This site may be insecure"
20-
- assertNotVisible:
21-
id: "LogoIcon"
20+
- assertVisible:
21+
id: "Globe-24"
2222
- tapOn: "Leave This Site"
2323
- assertNotVisible: "Warning: This site may be insecure"
2424

@@ -27,11 +27,13 @@ tags:
2727
id: "searchEntry"
2828
- inputText: "https://expired.badssl.com"
2929
- pressKey: Enter
30+
- assertVisible:
31+
id: "Globe-24"
3032
- tapOn: "Advanced"
3133
- scroll
3234
- tapOn: "Accept Risk and Visit Site"
3335
- assertVisible:
34-
id: "LogoIcon"
36+
id: "privacy-icon-shield.button"
3537
- assertVisible: "expired.badssl.com"
3638

3739

‎.maestro/release_tests/firebutton.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ tags:
3939
# Close tab
4040
- tapOn: "Tab Switcher"
4141
- tapOn: "Close \"Example Domain\" at example.com"
42-
- tapOn:
43-
id: "Add"
42+
- tapOn: "New Tab"
4443

4544
# Check history
4645
- assertVisible:

‎.maestro/release_tests/tabs.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ tags:
2323
- assertVisible: Tab Switcher
2424
- tapOn: Tab Switcher
2525
- assertVisible: ".*Privacy Test Pages.*"
26-
- assertVisible:
27-
id: "Add"
28-
- tapOn:
29-
id: "Add"
26+
- assertVisible: "New Tab"
27+
- tapOn: "New Tab"
3028
- assertVisible:
3129
id: "searchEntry"
3230
- tapOn:
@@ -84,10 +82,8 @@ tags:
8482
- assertVisible: Tab Switcher
8583
- tapOn: Tab Switcher
8684
- assertVisible: ".*Privacy Test Pages.*"
87-
- assertVisible:
88-
id: "Add"
89-
- tapOn:
90-
id: "Add"
85+
- assertVisible: "New Tab"
86+
- tapOn: "New Tab"
9187
- assertVisible:
9288
id: "searchEntry"
9389
- tapOn:

‎.maestro/release_tests/tabswitcher.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ tags:
2323
- assertVisible: Tab Switcher
2424
- tapOn: Tab Switcher
2525
- assertVisible: ".*Privacy Test Pages.*"
26-
- assertVisible:
27-
id: "Add"
28-
- tapOn:
29-
id: "Add"
26+
- assertVisible: "New Tab"
27+
- tapOn: "New Tab"
3028
- assertVisible:
3129
id: "searchEntry"
3230
- tapOn:

‎.maestro/shared/sync_recover_data.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ appId: com.duckduckgo.mobile.ios
1010
- pressKey: Enter
1111
- assertVisible: Get Started
1212
- tapOn: Get Started
13+
- runFlow:
14+
when:
15+
visible: Allows you to upload photographs and videos
16+
commands:
17+
- tapOn: "Allow"
1318
- tapOn: Enter Text Code Manually
1419
- tapOn: Paste
1520
- assertVisible: Save Recovery Code

0 commit comments

Comments
 (0)