Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Sync E2E tests #2338

Merged
merged 7 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
end-to-end-tests:
name: End to end Tests
runs-on: macos-13
runs-on: macos-13-xlarge

steps:
- name: Check out the code
Expand Down Expand Up @@ -43,6 +43,7 @@ jobs:
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
ONLY_ACTIVE_ARCH=NO \
| tee xcodebuild.log

- name: Release tests
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/sync-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
build-for-sync-end-to-end-tests:
name: Build for Sync End To End Tests
runs-on: macos-13
runs-on: macos-13-xlarge
timeout-minutes: 30

steps:
Expand Down Expand Up @@ -41,9 +41,10 @@ jobs:
run: |
set -o pipefail && xcodebuild \
-scheme "DuckDuckGo" \
-destination "platform=iOS Simulator,name=iPhone 14" \
-destination "platform=iOS Simulator,name=iPhone 15" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
ONLY_ACTIVE_ARCH=NO \
| tee xcodebuild.log

- name: Store Binary
Expand All @@ -65,7 +66,7 @@ jobs:
sync-end-to-end-tests:
name: Sync End To End Tests
needs: build-for-sync-end-to-end-tests
runs-on: macos-13
runs-on: macos-13-xlarge
timeout-minutes: 60
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .maestro/shared/copy_recovery_code_from_settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ appId: com.duckduckgo.mobile.ios
- scroll
- scroll
- scroll
- assertVisible: Debug Menu
- tapOn: Debug Menu
- assertVisible: All debug options
- tapOn: All debug options
- tapOn: Sync Info
- tapOn: Paste and Copy Recovery Code
- inputText: ${CODE}
Expand Down
6 changes: 4 additions & 2 deletions .maestro/shared/set_internal_user_from_settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ appId: com.duckduckgo.mobile.ios
- scroll
- scroll
- scroll
- assertVisible: Debug Menu
- tapOn: Debug Menu
- assertVisible: All debug options
- tapOn: All debug options
- tapOn: Internal User State
- tapOn: Settings
- tapOn: Done
- tapOn: Settings
3 changes: 1 addition & 2 deletions .maestro/shared/sync_create.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
appId: com.duckduckgo.mobile.ios
---

- assertVisible: Sync & Backup
- tapOn: Sync & Backup
- assertVisible: Sync & Backup
- tapOn: Sync and Back Up This Device
- assertVisible: You can sync with your other devices later.
- tapOn: Turn on Sync & Backup
- tapOn: Turn On Sync & Back Up
- assertVisible: Save Recovery Code
- tapOn: Copy Code
- tapOn: Next
Expand Down
2 changes: 1 addition & 1 deletion .maestro/shared/sync_verify_unified_favorites.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appId: com.duckduckgo.mobile.ios

- tapOn: Sync & Backup
- scroll
- assertVisible: Unify Favorites
- assertVisible: Unify Favorites Across Devices
- tapOn:
rightOf:
id: "UnifiedFavoritesToggle"
Expand Down
6 changes: 6 additions & 0 deletions .maestro/sync_tests/04_sync_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ tags:
- tapOn: Close Tabs and Clear Data

# Add local login
- runFlow:
when:
visible:
text: "Cancel"
commands:
- tapOn: Cancel
- tapOn: Settings
- runFlow:
file: ../shared/add_login_from_settings.yaml
Expand Down
Loading