[v2] [8/X] Unit Test Overhaul - Part 2

Tests/ApolloInternalTestHelpers/MockOperation.swift

@@ -1,4 +1,5 @@
 import ApolloAPI
+import Foundation
 
 open class MockOperation<SelectionSet: RootSelectionSet>: GraphQLOperation, @unchecked Sendable {
   public typealias Data = SelectionSet
@@ -23,6 +24,14 @@ open class MockQuery<SelectionSet: RootSelectionSet>: MockOperation<SelectionSet
   public static func mock() -> MockQuery<MockSelectionSet> where SelectionSet == MockSelectionSet {
     MockQuery<MockSelectionSet>()
   }
+
+  public var defaultResponseData: Foundation.Data {
+    return """
+    {
+      "data": {}
+    }
+    """.data(using: .utf8)!
+  }
 }
 
 open class MockMutation<SelectionSet: RootSelectionSet>: MockOperation<SelectionSet>, GraphQLMutation, @unchecked Sendable {

Tests/ApolloInternalTestHelpers/MockURLProtocol.swift

@@ -19,8 +19,7 @@ public final class MockURLProtocol<RequestProvider: MockResponseProvider>: URLPr
   override public func startLoading() {
     self.asyncTask = Task {
       guard
-        let url = self.request.url,
-        let handler = await RequestProvider.requestHandler(for: url)
+        let handler = await requestHandler(for: request.url)
       else {
         self.client?.urlProtocol(self, didFailWithError: MockURLError.requestNotHandled)
         return
@@ -52,7 +51,25 @@ public final class MockURLProtocol<RequestProvider: MockResponseProvider>: URLPr
       }
     }
   }
-
+
+  private func requestHandler(for url: URL?) async -> MockResponseProvider.MultiResponseHandler? {
+    guard let url = url else { return nil }
+
+    if let handler = await RequestProvider.requestHandler(for: url) {
+      return handler
+    }
+
+    var urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false)
+    urlComponents?.query = nil
+
+    if let urlWithoutQueryString = urlComponents?.string,
+       let urlWithoutQuery = URL(string: urlWithoutQueryString) {
+      return await RequestProvider.requestHandler(for: urlWithoutQuery)
+    }
+
+    return nil
+  }
+
   override public func stopLoading() {
     self.asyncTask?.cancel()
   }