Added fix for crash in load(_:mimeType:characterEncodingName:baseURL:…

…) (#286) * Added fix for crash in load(_:mimeType:characterEncodingName:baseURL:) * Whenever some test is using EmbraceHTTPMock, it should be able to use multiple connections at the same time w/o waiting * Fixing race condition on test_updateCallback * Fixing race condition on test_updateCallback
embrace-io · Jul 17, 2024 · 995b06b · 995b06b
1 parent f11fdc2
commit 995b06b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/Sources/EmbraceCore/Capture/WebView/WebViewCaptureService.swift b/Sources/EmbraceCore/Capture/WebView/WebViewCaptureService.swift
@@ -196,8 +196,8 @@ struct WKWebViewLoadFileURLSwizzler: Swizzlable {
 }
 
 struct WKWebViewLoadDataSwizzler: Swizzlable {
-    typealias ImplementationType = @convention(c) (WKWebView, Selector, Data, String, String, URL) -> WKNavigation?
-    typealias BlockImplementationType = @convention(block) (WKWebView, Data, String, String, URL) -> WKNavigation?
+    typealias ImplementationType = @convention(c) (WKWebView, Selector, Data, String, String, URL?) -> WKNavigation?
+    typealias BlockImplementationType = @convention(block) (WKWebView, Data, String, String, URL?) -> WKNavigation?
     static var selector: Selector = #selector(
         WKWebView.load(_:mimeType:characterEncodingName:baseURL:)
     )

diff --git a/Tests/EmbraceConfigInternalTests/EmbraceConfigTests.swift b/Tests/EmbraceConfigInternalTests/EmbraceConfigTests.swift
@@ -14,7 +14,9 @@ class EmbraceConfigTests: XCTestCase {
     }
 
     override func setUpWithError() throws {
-        EmbraceConfigTests.urlSessionConfig = URLSessionConfiguration.ephemeral
+        let config = URLSessionConfiguration.ephemeral
+        config.httpMaximumConnectionsPerHost = .max
+        EmbraceConfigTests.urlSessionConfig = config
         EmbraceConfigTests.urlSessionConfig.protocolClasses = [EmbraceHTTPMock.self]
     }
 
@@ -154,6 +156,10 @@ class EmbraceConfigTests: XCTestCase {
     }
 
     func test_updateCallback() throws {
+        expectation(forNotification: .embraceConfigUpdated, object: nil) { _ in
+            return true
+        }
+
         // given a config with 1 hour minimum update interval
         let options = testOptions(
             deviceId: TestConstants.deviceId,
@@ -169,9 +175,7 @@ class EmbraceConfigTests: XCTestCase {
         // making sure the fetched config is different so the notification is triggered
         config.payload.backgroundSessionThreshold = 12345
 
-        expectation(forNotification: .embraceConfigUpdated, object: nil) { _ in
-            return true
-        }
+        config.update()
 
         waitForExpectations(timeout: .veryLongTimeout)
     }

diff --git a/Tests/EmbraceCoreTests/Session/SessionControllerTests.swift b/Tests/EmbraceCoreTests/Session/SessionControllerTests.swift
@@ -37,6 +37,7 @@ final class SessionControllerTests: XCTestCase {
         }
 
         let urlSessionconfig = URLSessionConfiguration.ephemeral
+        urlSessionconfig.httpMaximumConnectionsPerHost = .max
         urlSessionconfig.protocolClasses = [EmbraceHTTPMock.self]
 
         testOptions = EmbraceUpload.Options(

diff --git a/Tests/EmbraceCoreTests/Session/UnsentDataHandlerTests.swift b/Tests/EmbraceCoreTests/Session/UnsentDataHandlerTests.swift
@@ -37,6 +37,7 @@ class UnsentDataHandlerTests: XCTestCase {
         )
 
         let urlSessionconfig = URLSessionConfiguration.ephemeral
+        urlSessionconfig.httpMaximumConnectionsPerHost = .max
         urlSessionconfig.protocolClasses = [EmbraceHTTPMock.self]
 
         let testCacheOptions = EmbraceUpload.CacheOptions(

diff --git a/Tests/EmbraceUploadInternalTests/EmbraceUploadOperationTests.swift b/Tests/EmbraceUploadInternalTests/EmbraceUploadOperationTests.swift
@@ -17,6 +17,7 @@ class EmbraceUploadOperationTests: XCTestCase {
 
     override func setUpWithError() throws {
         let urlSessionconfig = URLSessionConfiguration.ephemeral
+        urlSessionconfig.httpMaximumConnectionsPerHost = .max
         urlSessionconfig.protocolClasses = [EmbraceHTTPMock.self]
 
         self.urlSession = URLSession(configuration: urlSessionconfig)

diff --git a/Tests/EmbraceUploadInternalTests/EmbraceUploadTests.swift b/Tests/EmbraceUploadInternalTests/EmbraceUploadTests.swift
@@ -28,6 +28,7 @@ class EmbraceUploadTests: XCTestCase {
         }
 
         let urlSessionconfig = URLSessionConfiguration.ephemeral
+        urlSessionconfig.httpMaximumConnectionsPerHost = .max
         urlSessionconfig.protocolClasses = [EmbraceHTTPMock.self]
 
         testOptions = EmbraceUpload.Options(