Accelerated Checkouts Tests (#289)

* Add tests for AcceleratedCheckouts

* Remove iOS 16 guards in tests

* Remove fromString, add == func, improve tests

* Remove AcceleratedCheckoutRuntime

* Remove major var from CI

* Fix tests in CI

Author: markmur

.github/actions/setup-simulator/action.yml

@@ -1,5 +1,5 @@
-name: Setup
-description: Setup Node.js and install dependencies
+name: Setup iOS Simulator
+description: Prepare a simulator for a specific iOS major version
 
 runs:
   using: composite
@@ -10,7 +10,8 @@ runs:
         xcode-select -p
         xcrun xcodebuild -version
         xcrun simctl list runtimes
-        xcrun simctl list devicetypes
+        xcrun simctl list devicetypes | grep iPhone
         xcrun simctl delete all
+
         CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 16 Pro")
         echo "CURRENT_SIMULATOR_UUID=$CURRENT_SIMULATOR_UUID" >> $GITHUB_ENV

.github/workflows/ci.yml

@@ -11,18 +11,6 @@ env:
   JAVA_VERSION: '22'
 
 jobs:
-  lint-swift:
-    name: Lint Swift code
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Run SwiftLint
-        uses: norio-nomura/action-swiftlint@9f4dcd7fd46b4e75d7935cf2f4df406d5cae3684 # 3.2.1
-        with:
-          args: --strict
-
   license:
     name: Verify license headers
     runs-on: ubuntu-latest
@@ -56,6 +44,11 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
+      - name: Run SwiftLint
+        uses: norio-nomura/action-swiftlint@9f4dcd7fd46b4e75d7935cf2f4df406d5cae3684 # 3.2.1
+        with:
+          args: --strict
+
       - name: Setup
         uses: ./.github/actions/setup
 
@@ -123,10 +116,10 @@ jobs:
           yarn sample test:android --no-daemon
 
   test-ios:
-    name: Run iOS Tests
-    runs-on: macos-15-xlarge
+    name: Run Swift Tests
+    runs-on: macos-15
     timeout-minutes: 20
-    needs: [lint, lint-swift, test]
+    needs: [lint, test]
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -145,15 +138,6 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Check turbo cache
-        uses: ./.github/actions/use-turbo-cache
-
-      - name: Check build cache
-        run: |
-          CACHE_STATUS=$(./scripts/check_cache sample test:ios)
-          echo "[sample] build:ios - $CACHE_STATUS"
-          echo "turbo_cache_hit=$CACHE_STATUS" >> $GITHUB_ENV
-
       - name: Install cocoapods
         uses: ./.github/actions/install-cocoapods
         with:

modules/@shopify/checkout-sheet-kit/ios/AcceleratedCheckoutButtons+Extensions.swift

@@ -37,13 +37,8 @@ extension PayWithApplePayButtonLabel {
         return map[string] ?? .plain
     }
 
-    init?(fromString string: String?) {
-        guard let string,
-              let label = Self.map[string]
-        else {
-            return nil
-        }
-        self = label
+    public static func == (lhs: PayWithApplePayButtonLabel, rhs: PayWithApplePayButtonLabel) -> Bool {
+        return String(describing: lhs) == String(describing: rhs)
     }
 
     private static let map: [String: PayWithApplePayButtonLabel] = [

modules/@shopify/checkout-sheet-kit/ios/AcceleratedCheckoutButtons.swift

@@ -56,9 +56,14 @@ class AcceleratedCheckoutConfiguration {
 
 @objc(RCTAcceleratedCheckoutButtonsManager)
 class RCTAcceleratedCheckoutButtonsManager: RCTViewManager {
+    /// Internal property used in tests to simulate legacy devices
+    internal var supported: Bool = true
+
     override func view() -> UIView! {
-        if #available(iOS 16.0, *) {
-            return RCTAcceleratedCheckoutButtonsView()
+        if supported {
+            if #available(iOS 16.0, *) {
+                return RCTAcceleratedCheckoutButtonsView()
+            }
         }
 
         // Return an empty view for iOS < 16.0 (silent fallback)

sample/ios/ReactNative.xcodeproj/project.pbxproj

@@ -13,6 +13,8 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		6A1F48E72B16900600BA591C /* ShopifyCheckoutSheetKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A1F48E62B16900600BA591C /* ShopifyCheckoutSheetKitTests.swift */; };
 		6A86196D2BF36EB900E5EE1A /* CheckoutDidFailTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A86196C2BF36EB900E5EE1A /* CheckoutDidFailTests.swift */; };
+		6AEEAAB22C00010100E5EE1B /* AcceleratedCheckouts_SupportedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AEEAAB02C00010100E5EE1B /* AcceleratedCheckouts_SupportedTests.swift */; };
+		6AEEAAB32C00010100E5EE1B /* AcceleratedCheckouts_UnsupportedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AEEAAB12C00010100E5EE1B /* AcceleratedCheckouts_UnsupportedTests.swift */; };
 		6AFAD2D22BA9DEF8001F9644 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 6AFAD2D12BA9DEF8001F9644 /* Localizable.xcstrings */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		9403907249B4B6D988902B48 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 1939D329B2C035D1A15E316B /* PrivacyInfo.xcprivacy */; };
@@ -47,6 +49,8 @@
 		6A8D64CF2AF25C1200FE4E4A /* ReactNative.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = ReactNative.entitlements; path = ReactNative/ReactNative.entitlements; sourceTree = "<group>"; };
 		6AABC1942B17417E008240EB /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = "Pods/OpenSSL-Universal/Frameworks/OpenSSL.xcframework"; sourceTree = "<group>"; };
 		6AAEC3572B067AD500C7099B /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
+		6AEEAAB02C00010100E5EE1B /* AcceleratedCheckouts_SupportedTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcceleratedCheckouts_SupportedTests.swift; sourceTree = "<group>"; };
+		6AEEAAB12C00010100E5EE1B /* AcceleratedCheckouts_UnsupportedTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcceleratedCheckouts_UnsupportedTests.swift; sourceTree = "<group>"; };
 		6AF2B3762B0BCA6600C6CE4F /* ReactNative-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ReactNative-Bridging-Header.h"; sourceTree = "<group>"; };
 		6AFAD2D12BA9DEF8001F9644 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = Localizable.xcstrings; path = ReactNative/Localizable.xcstrings; sourceTree = "<group>"; };
 		6AFC2CB62B0D5814003B5A63 /* libShopifyCheckoutSheetKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libShopifyCheckoutSheetKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -82,6 +86,8 @@
 				00E356F01AD99517003FC87E /* Supporting Files */,
 				6A1F48E62B16900600BA591C /* ShopifyCheckoutSheetKitTests.swift */,
 				6A86196C2BF36EB900E5EE1A /* CheckoutDidFailTests.swift */,
+				6AEEAAB02C00010100E5EE1B /* AcceleratedCheckouts_SupportedTests.swift */,
+				6AEEAAB12C00010100E5EE1B /* AcceleratedCheckouts_UnsupportedTests.swift */,
 			);
 			path = ReactNativeTests;
 			sourceTree = "<group>";
@@ -415,6 +421,8 @@
 			files = (
 				6A1F48E72B16900600BA591C /* ShopifyCheckoutSheetKitTests.swift in Sources */,
 				6A86196D2BF36EB900E5EE1A /* CheckoutDidFailTests.swift in Sources */,
+				6AEEAAB22C00010100E5EE1B /* AcceleratedCheckouts_SupportedTests.swift in Sources */,
+				6AEEAAB32C00010100E5EE1B /* AcceleratedCheckouts_UnsupportedTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};