Paywalls: iOS 17 tests on CI (#2955)

RevenueCat · Sep 8, 2023 · 51282c1 · 51282c1
1 parent ddca58b
commit 51282c1
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -371,6 +371,26 @@ jobs:
           name: RevenueCatUI API Tests
           command: bundle exec fastlane build_revenuecatui_api_tester
 
+  spm-revenuecat-ui-ios-17:
+    <<: *base-job
+    steps:
+      - checkout
+      - update-spm-installation-commit
+      - run:
+          name: SPM RevenueCatUI Tests
+          command: bundle exec fastlane test_revenuecatui
+          no_output_timeout: 15m
+          environment:
+            SCAN_DEVICE: iPhone 14 Pro,OS=17.0
+      - compress_result_bundle:
+          directory: fastlane/test_output
+          bundle_name: revenuecatui
+      - store_test_results:
+          path: fastlane/test_output/revenuecatui/tests.xml
+      - store_artifacts:
+          path: fastlane/test_output
+          destination: scan-test-output
+
   run-test-ios-17:
     <<: *base-job
     steps:
@@ -947,6 +967,8 @@ workflows:
           xcode_version: '14.3.0'
       - spm-revenuecat-ui-ios-16:
           xcode_version: '14.3.0'
+      - spm-revenuecat-ui-ios-17:
+          xcode_version: '15.0.0'
       # Disabled until we drop support for iOS 11
       # - run-test-ios-17:
       #     xcode_version: '15.0.0'

diff --git a/Tests/RevenueCatUITests/BaseSnapshotTest.swift b/Tests/RevenueCatUITests/BaseSnapshotTest.swift
@@ -49,16 +49,28 @@ extension BaseSnapshotTest {
 extension View {
 
     /// Adds the receiver to a view hierarchy to be able to test lifetime logic.
-    func addToHierarchy() {
+    func addToHierarchy() throws {
+        if #available(iOS 17.0, *) {
+            try XCTSkipIf(true, "This is currently not working on iOS 17")
+        }
+
+        UIView.setAnimationsEnabled(false)
+
         let controller = UIHostingController(
             rootView: self
                 .frame(width: BaseSnapshotTest.fullScreenSize.width,
                        height: BaseSnapshotTest.fullScreenSize.height)
         )
 
         let window = UIWindow()
+        window.isHidden = false
         window.rootViewController = controller
         window.frame.size = BaseSnapshotTest.fullScreenSize
+        window.makeKeyAndVisible()
+
+        window.addSubview(controller.view)
+        controller.didMove(toParent: controller)
+
         window.setNeedsLayout()
         window.layoutIfNeeded()
 

diff --git a/Tests/RevenueCatUITests/PresentIfNeededTests.swift b/Tests/RevenueCatUITests/PresentIfNeededTests.swift
@@ -26,7 +26,7 @@ class PresentIfNeededTests: TestCase {
     func testPresentWithPurchaseHandler() throws {
         var customerInfo: CustomerInfo?
 
-        Text("")
+        try Text("")
             .presentPaywallIfNeeded(offering: Self.offering,
                                     introEligibility: .producing(eligibility: .eligible),
                                     purchaseHandler: Self.purchaseHandler) { _ in

diff --git a/Tests/RevenueCatUITests/PurchaseCompletedHandlerTests.swift b/Tests/RevenueCatUITests/PurchaseCompletedHandlerTests.swift
@@ -29,7 +29,7 @@ class PurchaseCompletedHandlerTests: TestCase {
         var customerInfo: CustomerInfo?
         var purchased = false
 
-        PaywallView(
+        try PaywallView(
             offering: Self.offering.withLocalImages,
             introEligibility: .producing(eligibility: .eligible),
             purchaseHandler: handler
@@ -51,7 +51,7 @@ class PurchaseCompletedHandlerTests: TestCase {
     func testOnPurchaseCompleted() throws {
         var customerInfo: CustomerInfo?
 
-        PaywallView(
+        try PaywallView(
             offering: Self.offering.withLocalImages,
             introEligibility: .producing(eligibility: .eligible),
             purchaseHandler: Self.purchaseHandler