BasePurchasesTests: changed default back to SK1 (#1935)

Follow up to #1922. Most of the tests from the subclasses assume SK2 is disabled. This changes the default for those back to SK1. The tests that do require SK2, define so explicitly. I also replaced a bunch of force-unwraps with `XCTUnwrap` so tests don't crash (which is what was happening when running these tests with SK2 enabled).
RevenueCat · Sep 23, 2022 · 06b8009 · 06b8009
1 parent 4fffe83
commit 06b8009
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 48 deletions.
diff --git a/Tests/UnitTests/Purchasing/Purchases/BasePurchasesTests.swift b/Tests/UnitTests/Purchasing/Purchases/BasePurchasesTests.swift
@@ -26,7 +26,7 @@ class BasePurchasesTests: TestCase {
         try super.setUpWithError()
 
         self.userDefaults = UserDefaults(suiteName: Self.userDefaultsSuiteName)
-        self.systemInfo = MockSystemInfo(finishTransactions: true)
+        self.systemInfo = MockSystemInfo(finishTransactions: true, storeKit2Setting: self.storeKit2Setting)
         self.deviceCache = MockDeviceCache(sandboxEnvironmentDetector: self.systemInfo,
                                            userDefaults: self.userDefaults)
         self.requestFetcher = MockRequestFetcher()
@@ -146,7 +146,9 @@ class BasePurchasesTests: TestCase {
     }
 
     func setupPurchasesObserverModeOn() throws {
-        self.systemInfo = try MockSystemInfo(platformInfo: nil, finishTransactions: false)
+        self.systemInfo = try MockSystemInfo(platformInfo: nil,
+                                             finishTransactions: false,
+                                             storeKit2Setting: self.storeKit2Setting)
         self.initializePurchasesInstance(appUserId: nil)
     }
 
@@ -225,6 +227,12 @@ class BasePurchasesTests: TestCase {
         self.storeKit1Wrapper.delegate?.storeKit1Wrapper(self.storeKit1Wrapper, updatedTransaction: transaction)
     }
 
+    var storeKit2Setting: StoreKit2Setting {
+        // Even though the new default is StoreKit 2, most of the tests from this parent class
+        // were written for SK1. Therefore we want to default to it being disabled.
+        return .enabledOnlyForOptimizations
+    }
+
 }
 
 extension BasePurchasesTests {

diff --git a/Tests/UnitTests/Purchasing/Purchases/PurchasesDeferredPurchasesTests.swift b/Tests/UnitTests/Purchasing/Purchases/PurchasesDeferredPurchasesTests.swift
@@ -147,13 +147,15 @@ class PurchaseDeferredPurchasesSK2Tests: BasePurchasesTests {
     private var paymentQueueWrapperDelegate: PaymentQueueWrapperDelegate!
     private var product: MockSK1Product!
 
+    override var storeKit2Setting: StoreKit2Setting {
+        return .enabledForCompatibleDevices
+    }
+
     override func setUpWithError() throws {
         try super.setUpWithError()
 
         try AvailabilityChecks.iOS15APIAvailableOrSkipTest()
 
-        self.systemInfo = MockSystemInfo(finishTransactions: false, storeKit2Setting: .enabledForCompatibleDevices)
-
         self.setupPurchases()
 
         self.product = MockSK1Product(mockProductIdentifier: "mock_product")