From 06317591d69ea5912057588bc17faab85abc5e52 Mon Sep 17 00:00:00 2001
From: Sabrina Tardio <44158575+SabrinaTardio@users.noreply.github.com>
Date: Tue, 16 Jan 2024 16:21:22 +0100
Subject: [PATCH] Fix Sync E2E tests (#2338)

Co-authored-by: Dominik Kapusta <dkapusta@duckduckgo.com>
---
 .github/workflows/end-to-end.yml                      | 3 ++-
 .github/workflows/sync-end-to-end.yml                 | 7 ++++---
 .maestro/shared/copy_recovery_code_from_settings.yaml | 4 ++--
 .maestro/shared/set_internal_user_from_settings.yaml  | 6 ++++--
 .maestro/shared/sync_create.yaml                      | 3 +--
 .maestro/shared/sync_verify_unified_favorites.yaml    | 2 +-
 .maestro/sync_tests/04_sync_data.yaml                 | 6 ++++++
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
index 528f9cd58d..2f31dc7bf3 100644
--- a/.github/workflows/end-to-end.yml
+++ b/.github/workflows/end-to-end.yml
@@ -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
@@ -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
diff --git a/.github/workflows/sync-end-to-end.yml b/.github/workflows/sync-end-to-end.yml
index 025aaae511..78d7e2ad1e 100644
--- a/.github/workflows/sync-end-to-end.yml
+++ b/.github/workflows/sync-end-to-end.yml
@@ -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:
@@ -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
@@ -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:
diff --git a/.maestro/shared/copy_recovery_code_from_settings.yaml b/.maestro/shared/copy_recovery_code_from_settings.yaml
index 16ab4cfebf..7f266e68ea 100644
--- a/.maestro/shared/copy_recovery_code_from_settings.yaml
+++ b/.maestro/shared/copy_recovery_code_from_settings.yaml
@@ -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}
diff --git a/.maestro/shared/set_internal_user_from_settings.yaml b/.maestro/shared/set_internal_user_from_settings.yaml
index 97d6e6c9c4..fefcc20b78 100644
--- a/.maestro/shared/set_internal_user_from_settings.yaml
+++ b/.maestro/shared/set_internal_user_from_settings.yaml
@@ -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
\ No newline at end of file
diff --git a/.maestro/shared/sync_create.yaml b/.maestro/shared/sync_create.yaml
index bcb1968ebe..f7be860848 100644
--- a/.maestro/shared/sync_create.yaml
+++ b/.maestro/shared/sync_create.yaml
@@ -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
diff --git a/.maestro/shared/sync_verify_unified_favorites.yaml b/.maestro/shared/sync_verify_unified_favorites.yaml
index e23b239ac8..843a223a65 100644
--- a/.maestro/shared/sync_verify_unified_favorites.yaml
+++ b/.maestro/shared/sync_verify_unified_favorites.yaml
@@ -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"
diff --git a/.maestro/sync_tests/04_sync_data.yaml b/.maestro/sync_tests/04_sync_data.yaml
index 20605a75f8..48f6a617ad 100644
--- a/.maestro/sync_tests/04_sync_data.yaml
+++ b/.maestro/sync_tests/04_sync_data.yaml
@@ -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