[v2] GraphQLOperation.Variable Cleanup

Tests/ApolloInternalTestHelpers/MockNetworkTransport.swift

@@ -6,6 +6,8 @@ public final class MockNetworkTransport: NetworkTransport {
   public let mockServer: MockGraphQLServer
   public let requestChainTransport: RequestChainNetworkTransport
 
+  public var url: URL { requestChainTransport.endpointURL }
+
   public init(
     mockServer: MockGraphQLServer = MockGraphQLServer(),
     store: ApolloStore
@@ -87,7 +89,7 @@ public final class MockNetworkTransport: NetworkTransport {
       }
 
       let httpResponse = HTTPURLResponse(
-        url: TestURL.mockServer.url,
+        url: request.url!,
         statusCode: 200,
         httpVersion: nil,
         headerFields: nil

Tests/ApolloTests/ApolloStore_BatchedLoadTests.swift

@@ -114,6 +114,7 @@
     XCTAssertEqual(data.hero?.name, "R2-D2")
     XCTAssertEqual(data.hero?.friends?.count, 100)
 
+    // 3 loads: ROOT_QUERY.hero, hero.friends, list of friends
     XCTAssertEqual(cache.numberOfBatchLoads, 3)
   }
 
@@ -173,7 +174,7 @@
 
     let query = MockQuery<GivenSelectionSet>()
 
     try await withThrowingTaskGroup { group in
       for _ in (1...10) {
         group.addTask {
           let graphQLResult = try await store.load(query)

Tests/ApolloTests/AutomaticPersistedQueriesTests.swift

@@ -228,7 +228,6 @@
         expectation.to(equal("{\"episode\":\"\(episode.rawValue)\"}"))
 
       case .none:
-        #warning("TODO: write test to test this case actually happens")
         expectation.to(equal("{}"))
 
       case .null:
@@ -751,7 +750,7 @@
       store: store,
       endpointURL: Self.endpoint,
       apqConfig: .init(autoPersistQueries: true),
     )    
 
     let query = MockPersistedOnlyQuery(episode: .some(.EMPIRE))