Fix integration tests and run them only in defaults flavor

RevenueCat · Jul 20, 2023 · 33341fa · 33341fa
1 parent 58592a5
commit 33341fa
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/purchases/src/androidTest/kotlin/com/revenuecat/purchases/purchasesExtensions.kt b/purchases/src/androidTest/kotlin/com/revenuecat/purchases/purchasesExtensions.kt
@@ -29,13 +29,13 @@ fun Purchases.Companion.resetSingleton() {
 }
 
 var Purchases.forceServerErrors: Boolean
-    get() = appConfig.forceServerErrors
+    get() = purchasesOrchestrator.appConfig.forceServerErrors
     set(value) {
-        appConfig.forceServerErrors = value
+        purchasesOrchestrator.appConfig.forceServerErrors = value
     }
 
 var Purchases.forceSigningErrors: Boolean
-    get() = appConfig.forceSigningErrors
+    get() = purchasesOrchestrator.appConfig.forceSigningErrors
     set(value) {
-        appConfig.forceSigningErrors = value
+        purchasesOrchestrator.appConfig.forceSigningErrors = value
     }
diff --git a/...purchases/BasePurchasesIntegrationTest.kt → ...purchases/BasePurchasesIntegrationTest.kt b/...purchases/BasePurchasesIntegrationTest.kt → ...purchases/BasePurchasesIntegrationTest.kt
diff --git a/...cat/purchases/PurchasesIntegrationTest.kt → ...cat/purchases/PurchasesIntegrationTest.kt b/...cat/purchases/PurchasesIntegrationTest.kt → ...cat/purchases/PurchasesIntegrationTest.kt
diff --git a/...BaseOfflineEntitlementsIntegrationTest.kt → ...BaseOfflineEntitlementsIntegrationTest.kt b/...BaseOfflineEntitlementsIntegrationTest.kt → ...BaseOfflineEntitlementsIntegrationTest.kt
diff --git a/...ntitlementsFreshInstallIntegrationTest.kt → ...ntitlementsFreshInstallIntegrationTest.kt b/...ntitlementsFreshInstallIntegrationTest.kt → ...ntitlementsFreshInstallIntegrationTest.kt
diff --git a/...nitialRequestsCompletedIntegrationTest.kt → ...nitialRequestsCompletedIntegrationTest.kt b/...nitialRequestsCompletedIntegrationTest.kt → ...nitialRequestsCompletedIntegrationTest.kt
@@ -51,20 +51,21 @@ abstract class BaseOfflineEntitlementsWithInitialRequestsCompletedIntegrationTes
     }
 
     private fun waitForInitialRequestsToEnd(completion: () -> Unit) {
-        Purchases.sharedInstance.offlineEntitlementsManager.updateProductEntitlementMappingCacheIfStale {
-            if (it != null) {
-                fail("Expected to get product entitlement mapping but got error: $it")
-            } else {
-                Purchases.sharedInstance.getCustomerInfoWith(
-                    onError = { customerInfoError ->
-                        fail("Expected to succeed getting customer info. Got $customerInfoError")
-                    },
-                    onSuccess = {
-                        completion()
-                    },
-                )
+        Purchases.sharedInstance.purchasesOrchestrator.offlineEntitlementsManager
+            .updateProductEntitlementMappingCacheIfStale {
+                if (it != null) {
+                    fail("Expected to get product entitlement mapping but got error: $it")
+                } else {
+                    Purchases.sharedInstance.getCustomerInfoWith(
+                        onError = { customerInfoError ->
+                            fail("Expected to succeed getting customer info. Got $customerInfoError")
+                        },
+                        onSuccess = {
+                            completion()
+                        },
+                    )
+                }
             }
-        }
     }
 
     // endregion helpers

diff --git a/...ementsInformationalModeIntegrationTest.kt → ...ementsInformationalModeIntegrationTest.kt b/...ementsInformationalModeIntegrationTest.kt → ...ementsInformationalModeIntegrationTest.kt