Merge pull request #288 from sbenedicadb/update-e2e-tests

-fix race condition in e2e tests
adobe · Aug 12, 2024 · 5c85d66 · 5c85d66
2 parents ec9a361 + 1b684c3
commit 5c85d66
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/AEPMessaging/Tests/E2EFunctionalTests/E2EFunctionalTests.swift b/AEPMessaging/Tests/E2EFunctionalTests/E2EFunctionalTests.swift
@@ -59,19 +59,25 @@ class E2EFunctionalTests: XCTestCase, AnyCodableAsserts {
         MobileCore.clearUpdatedConfiguration()
 
         let environment = Environment.get()
-        MobileCore.configureWith(appId: environment.appId)
-        if let configUpdates = environment.configurationUpdates {
-            MobileCore.updateConfigurationWith(configDict: configUpdates)
-        }
-
+        MobileCore.updateConfigurationWith(configDict: environment.configurationUpdates)
+
         let extensions = [
             Consent.self,
             AEPEdgeIdentity.Identity.self,
             Messaging.self,
             Edge.self
         ]
-
-        MobileCore.registerExtensions(extensions)
+
+        MobileCore.registerExtensions(extensions) {
+            MobileCore.configureWith(appId: environment.appId)
+        }
+
+        // wait 2 seconds to allow configuration to download
+        let semaphore = DispatchSemaphore(value: 0)
+        DispatchQueue.global().asyncAfter(deadline: .now() + .seconds(2)) {
+            semaphore.signal()
+        }
+        semaphore.wait()
     }
 
     func registerMessagingRequestContentListener(_ listener: @escaping EventListener) {

diff --git a/AEPMessaging/Tests/E2EFunctionalTests/Environment.swift b/AEPMessaging/Tests/E2EFunctionalTests/Environment.swift
@@ -83,12 +83,12 @@ extension Environment {
         }
     }
 
-    var configurationUpdates: [String: Any]? {
+    var configurationUpdates: [String: Any] {
         guard isStaging else {
-            return nil
+            return [ "edge.environment": "" ]
         }
 
-        return ["edge.environment": "int"]
+        return [ "edge.environment": "int" ]
     }
 
     private var isStaging: Bool {