move logic

apollographql · Apr 24, 2024 · bcd51e0 · bcd51e0
1 parent 8df6013
commit bcd51e0
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/testing/core/mocking/mockLink.ts b/src/testing/core/mocking/mockLink.ts
@@ -214,13 +214,6 @@ ${unmatchedVars.map((d) => `  ${stringifyForDisplay(d)}`).join("\n")}
       newMockedResponse.request.query = query;
     }
 
-    newMockedResponse.request.variables = {
-      ...getDefaultValues(
-        getOperationDefinition(newMockedResponse.request.query)
-      ),
-      ...newMockedResponse.request.variables,
-    };
-
     mockedResponse.maxUsageCount = mockedResponse.maxUsageCount ?? 1;
     invariant(
       mockedResponse.maxUsageCount > 0,
@@ -233,17 +226,21 @@ ${unmatchedVars.map((d) => `  ${stringifyForDisplay(d)}`).join("\n")}
   }
 
   private normalizeVariableMatching(mockedResponse: MockedResponse) {
-    const variables = mockedResponse.request.variables;
-    if (mockedResponse.variableMatcher && variables) {
+    const request = mockedResponse.request;
+    if (mockedResponse.variableMatcher && request.variables) {
       throw new Error(
         "Mocked response should contain either variableMatcher or request.variables"
       );
     }
 
     if (!mockedResponse.variableMatcher) {
+      request.variables = {
+        ...getDefaultValues(getOperationDefinition(request.query)),
+        ...request.variables,
+      };
       mockedResponse.variableMatcher = (vars) => {
         const requestVariables = vars || {};
-        const mockedResponseVariables = variables || {};
+        const mockedResponseVariables = request.variables || {};
         return equal(requestVariables, mockedResponseVariables);
       };
     }