chore(tests): end to end testing again

.circleci/config.yml

@@ -175,7 +175,7 @@ jobs:
       BUNDLE_PATH: .vendor
 
     macos:
-      xcode: 16.1
+      xcode: 16.2
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -191,12 +191,58 @@ jobs:
           name: Update rollout if needed
           command: ./scripts/deploys/update-android-rollout-if-needed
 
+  run-e2e-tests:
+    parallelism: 4
+
+    environment:
+      BUNDLE_PATH: .vendor # path to install gems and use for caching
+
+    macos:
+      xcode: 16.2
+      resource_class: m2pro.medium
+
+    steps:
+      - attach_workspace:
+          at: ../workspace
+      - macos/preboot-simulator:
+          version: "18.2"
+          platform: "iOS"
+          device: "iPhone 16 Pro"
+      - run:
+          name: Install maestro
+          command: curl -Ls "https://get.maestro.mobile.dev" | bash
+      - run:
+          name: Install idb
+          command: brew tap facebook/fb && brew install idb-companion
+      - run:
+          name: Clear project dir
+          command: |
+            rm -rf  /Users/distiller/project/*
+      - checkout
+      - setup-awscli
+      - run:
+          name: Set up maestro env
+          command: ./scripts/setup/setup-maestro-env.sh
+      - run:
+          name: Download app zip
+          command: aws s3 cp s3://artsy-citadel/eigen/builds/ios/Artsy-latest.zip ./Artsy.zip
+      - run:
+          name: Unzip the app
+          command: unzip Artsy.zip
+      - run:
+          name: Install app in booted sims
+          command: ./scripts/utils/install_app_in_booted_sims.sh
+      - run:
+          name: Run Maestro Tests
+          no_output_timeout: 25m
+          command: ./scripts/utils/run_maestro_shard.sh
+
   deploy-nightly-beta:
     environment:
       BUNDLE_PATH: .vendor
 
     macos:
-      xcode: 16.1
+      xcode: 16.2
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -217,7 +263,7 @@ jobs:
       BUNDLE_PATH: .vendor
 
     macos:
-      xcode: 16.1
+      xcode: 16.2
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -309,7 +355,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 16.1
+      xcode: 16.2
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -383,7 +429,7 @@ jobs:
       BUNDLE_PATH: .vendor # path to install gems and use for caching
 
     macos:
-      xcode: 16.1
+      xcode: 16.2
       resource_class: macos.m1.medium.gen1
 
     steps:
@@ -423,7 +469,7 @@ jobs:
       - install-gems
       - install-cocoapods
       - macos/preboot-simulator:
-          version: "18.1"
+          version: "18.2"
           platform: "iOS"
           device: "iPhone 16 Pro"
       - build-app-ios
@@ -518,8 +564,12 @@ workflows:
               only:
                 - main
     jobs:
+      - build-test-app-ios
       - deploy-nightly-beta
       - run-nightly-tasks
+      - run-e2e-tests:
+          requires:
+            - build-test-app-ios
 
   flag-check:
     triggers:
@@ -600,3 +650,11 @@ workflows:
           requires:
             - build-test-app-ios
             - build-test-app-android
+
+      - run-e2e-tests:
+          filters:
+            branches:
+              only:
+                - beta-ios
+          requires:
+            - build-test-app-ios

.gitignore

@@ -151,6 +151,9 @@ tsconfig.tsbuildinfo
 # Temporary files created by Metro to check the health of the file watcher
 .metro-health-check*
 
+# maestro test artifacts
+.maestro/*
+
 #########################################################
 # Keep this rule last.
 # Keep these, so we can keep the folders these appear in.

app.json

@@ -1,6 +1,6 @@
 {
   "appName": "eigen",
-  "version": "8.74.0",
+  "version": "8.75.0",
   "isAndroidBeta": false,
   "slug": "eigen",
   "expo": {

e2e/config.yml

@@ -1,9 +1,4 @@
 appId: ${MAESTRO_APP_ID}
 ---
-- runFlow:
-    file: flows/onboarding/login.yml
-- runFlow:
-    file: flows/onboarding/signupWithoutOnboarding.yml
-# This flow is broken because of performance issues and hangs of the Art Taste Quiz Screen
-# - runFlow:
-# file: flows/onboarding/onboardingQuiz.yml
+flows:
+  - "flows/*"

e2e/flows/deeplinks.yml

@@ -0,0 +1,23 @@
+appId: ${MAESTRO_APP_ID}
+---
+- launchApp:
+    clearState: false
+    arguments:
+      email: ${MAESTRO_TEST_EMAIL}
+      password: ${MAESTRO_TEST_PASSWORD}
+- assertVisible: "New Works for You"
+- killApp
+- openLink:
+    link: https://www.artsy.net/artist/kaws
+    autoVerify: false
+- assertVisible: "Kaws"
+- killApp
+- openLink:
+    link: https://click.artsy.net/f/a/epPWiX0dJaHHMiXAnSrzSg~~/AAQRxQA~/RgRj95QSP0SQaHR0cHM6Ly93d3cuYXJ0c3kubmV0L2NvbGxlY3Rpb24vYXVjdGlvbi1oaWdobGlnaHRzP3V0bV9zb3VyY2U9YnJhemUmdXRtX21lZGl1bT1lbWFpbCZ1dG1fY2FtcGFpZ249bnRmJnV0bV90ZXJtPTYyMTRmYjlkZWI0ZWZkN2RiNjBjZTcwNDk1NWU4NDQ1VwNzcGNCCmIFEg8VYlEJKGBSEmJyaWJlY2sxQGdtYWlsLmNvbVgEAAAAfw~~
+    autoVerify: false
+- assertVisible: "Highlights at Auction This Week"
+- killApp
+- openLink:
+    link: "https://email-link.artsy.net/ls/click?upn=u001.XPbk8dXjc6dwd18Yq2uPM3eTWB4YbDUmeJTAXXTF513sTSKEFRIPxrFgGj8gd2LN9AcRIza5p2-2Fi0huqjv6GWgdnpwA-2FRyTEIYA-2BT1-2F0josxHnYTzJpKeJEmkfzDQlMEY9y6FknqDddY-2BKmm5qtTrTIF2hxySbdUboaYf5ofK-2Bj-2FgSolzBiLvvzai-2FmvjWbSpNpJHWATexQixwLakesmmZUBoRoLkCnxs59pBxJPbB3JZyP13cv77lbfn1WzJ86fiW-2B5MQcd2qss7wLGBI-2BZuy-2FxDkbFuDzpfYPDlaUs1-2BuyO9rqleUCwXPEuyWXZ3aGJrh-_dWIRBTTKlL2IhQqV5a1Cy38Sd4xylePmkTfQkXpdWOLZbG0vcWuzG-2BSSjZ7xaSUgPR0lxFBD0Zz4mpyMqiSRd7GblcbPN8eH0NYfUK6pmADWc2UoFXyJdeq-2F-2BOyOeWlS7O-2FOrHgB9-2BOGtV1nkIFPq97vJTNmWtBMDOt77SsursARR1LHG7CnzBEedV5yll40aEh9LTjA47-2BfpvonTwdxvYfd6ZWsZN2uRczvCs34ipSKUClLSzq0xCn8IjAixssMm2IreBk6LmNzHPC1YLqmZ77pv0qTxX095mxh8mk7f9rJJ8Tg1fyfRFriXGsQqgHlY-2BqTf2aAU6LS9NVXirqdp20-2BHXhzUZbaCnkQNASABts91iKoZaDeV4xnYuuo3L-2F8"
+    autoVerify: false
+- assertVisible: "The artwork you were looking for isn't available."

e2e/flows/login.yml

@@ -0,0 +1,13 @@
+appId: ${MAESTRO_APP_ID}
+---
+- launchApp:
+    clearState: false
+    arguments:
+      shouldSignOut: "true"
+- assertVisible: "Sign up or log in"
+- tapOn: "Email Input"
+- inputText: ${MAESTRO_TEST_EMAIL}
+- tapOn: "Continue.*"
+- inputText: ${MAESTRO_TEST_PASSWORD}
+- tapOn: "Continue.*"
+- assertVisible: "New Works for You"

e2e/flows/signup.yml

@@ -0,0 +1,21 @@
+appId: ${MAESTRO_APP_ID}
+---
+- launchApp:
+    clearState: false
+    arguments:
+      shouldSignOut: "true"
+- runScript:
+    file: signup.js
+- assertVisible: "Sign up or log in"
+- tapOn: "Email Input"
+- inputText: ${output.signup.email}
+- tapOn: "Continue.*"
+- assertVisible: "Welcome to Artsy"
+- inputText: ${output.signup.password}
+- tapOn: "Continue.*"
+- inputText: "Test McTest"
+- runFlow:
+    commands:
+      - tapOn:
+          point: 15%,36%
+- tapOn: "Continue.*"

e2e/flows/onboarding/signupWithoutOnboarding.yml → e2e/flows/signupWithoutOnboarding.yml

@@ -2,5 +2,6 @@ appId: ${MAESTRO_APP_ID}
 ---
 - runFlow:
     file: signup.yml
+- assertVisible: "Ready to find art you love?"
 - tapOn: "Skip.*"
 - assertVisible: "New Works for You"

fastlane/Fastfile

@@ -47,6 +47,7 @@ GIT_REMOTE_ORIGIN_URL = `git config --get remote.origin.url`.chomp
 
 S3_PATH = 's3://artsy-citadel/eigen'
 S3_ANDROID_BUILDS_PATH = S3_PATH + '/builds/android/'
+S3_IOS_BUILDS_PATH = S3_PATH + '/builds/ios/'
 
 import 'utility_fastlane.rb'
 import 'sentry_fastlane.rb'
@@ -361,12 +362,6 @@ lane :create_android_apk do
   )
 end
 
-lane :s3_upload_android_build do |options|
-  app_version = options[:app_version]
-  app_path = options[:app_path]
-  sh('aws s3 cp ' + app_path + ' ' + S3_ANDROID_BUILDS_PATH + app_version.to_s + '.aab')
-end
-
 lane :select_android_build do |options|
   select_message = options[:select_message] || 'release'
   skip_download = options[:skip_download] || false

fastlane/utility_fastlane.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 # Utility functions
 
 desc "Updates the version string in app.json"
@@ -70,6 +72,49 @@
   )
 end
 
+# Build and upload iOS and Android builds to S3
+
+lane :s3_upload_ios_build do |options|
+  UI.message("Uploading iOS build to S3...")
+
+  app_version = options[:app_version]
+  archive_root = options[:archive_root] || "../archives"
+  app_name = options[:app_name] || "Artsy"
+
+  # Find latest archive
+  pattern = File.join(archive_root, "#{app_name}*.xcarchive")
+  matching_archives = Dir.glob(pattern)
+
+  UI.user_error!("No .xcarchive found matching pattern #{pattern}") unless matching_archives.any?
+
+  latest_archive = matching_archives.max_by { |f| File.mtime(f) }
+  app_path = File.join(latest_archive, "Products/Applications/#{app_name}.app")
+  UI.user_error!("App not found at #{app_path}") unless File.exist?(app_path)
+
+  # Create zip
+  zip_name = "#{app_name}-#{app_version}.zip"
+  zip_path = File.join(archive_root, zip_name)
+  latest_zip_path = File.join(archive_root, "#{app_name}-latest.zip")
+  app_dir = File.dirname(app_path)
+  app_folder = File.basename(app_path)
+  zip_path_absolute = Pathname.new(zip_path).realpath.to_s rescue Pathname.new(zip_path).expand_path.to_s
+
+  sh("cd '#{app_dir}' && zip -r '#{zip_path_absolute}' '#{app_folder}'")
+  FileUtils.cp(zip_path, latest_zip_path)
+
+  # Upload both versioned and "latest"
+  sh("aws s3 cp #{zip_path} #{S3_IOS_BUILDS_PATH}#{zip_name}")
+  sh("aws s3 cp #{latest_zip_path} #{S3_IOS_BUILDS_PATH}#{app_name}-latest.zip")
+
+  UI.success("✅ Uploaded #{zip_name} and latest to S3")
+end
+
+lane :s3_upload_android_build do |options|
+  app_version = options[:app_version]
+  app_path = options[:app_path]
+  sh('aws s3 cp ' + app_path + ' ' + S3_ANDROID_BUILDS_PATH + app_version.to_s + '.aab')
+end
+
 lane :tag_and_push do |options|
   # Do a tag, we use a http git remote so we can have push access
   # as the default remote for circle is read-only

ios/Artsy/Networking/API_Modules/ArtsyAPI+DeviceTokens.m

@@ -13,6 +13,13 @@ + (AFHTTPRequestOperation *)setAPNTokenForCurrentDevice:(NSString *)token succes
 
     if (token && name) {
         NSURLRequest *request = [ARRouter newSetDeviceAPNTokenRequest:token forDevice:name];
+
+        // TODO: Is it a problem that this can be nil?
+        // Should we fail loudly? Wait for the httpClient to be ready?
+        if (!request) {
+            return nil;
+        }
+
         return [ArtsyAPI performRequest:request success:success failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error) {
             if (failure) {
                 failure(error);
@@ -31,6 +38,11 @@ + (AFHTTPRequestOperation *)deleteAPNTokenForCurrentDeviceWithCompletion:(void (
         return nil;
     }
     NSURLRequest *request = [ARRouter newDeleteDeviceRequest:token];
+
+    if (!request) {
+        completion();
+        return nil;
+    }
     return [ArtsyAPI performRequest:request success:^ (id _) {
         completion();
     } failure:^(NSURLRequest *request, NSHTTPURLResponse *response, NSError *error) {

ios/ArtsyTests/Supporting_Files/ARTestHelper.m

@@ -16,8 +16,8 @@ - (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:
 {
     NSOperatingSystemVersion version = [NSProcessInfo processInfo].operatingSystemVersion;
 
-    NSAssert(version.majorVersion == 18 && version.minorVersion == 1,
-             @"The tests should be run on iOS 18.1, not %ld.%ld", version.majorVersion, version.minorVersion);
+    NSAssert(version.majorVersion == 18 && version.minorVersion == 2,
+             @"The tests should be run on iOS 18.2, not %ld.%ld", version.majorVersion, version.minorVersion);
 
     CGSize nativeResolution = [UIScreen mainScreen].nativeBounds.size;
     NSAssert([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone && CGSizeEqualToSize(nativeResolution, CGSizeMake(1206, 2622)),