chore: fix tests post-merge and merge resolvers in .fork

apollographql · Apr 12, 2024 · 25872f6 · 25872f6
1 parent f51a233
commit 25872f6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/testing/core/__tests__/createTestSchema.test.tsx b/src/testing/core/__tests__/createTestSchema.test.tsx
@@ -1011,24 +1011,26 @@ describe("schema proxy", () => {
   });
 
   describe("schema.reset", () => {
-    const resetTestSchema = createTestSchema(schemaWithMocks, {
-      Query: {
-        viewer: () => ({
-          book: {
-            text: "Hello World",
-            title: "Orlando: A Biography",
+    const resetTestSchema = createTestSchema(schema, {
+      resolvers: {
+        Query: {
+          viewer: () => ({
+            book: {
+              text: "Hello World",
+              title: "Orlando: A Biography",
+            },
+          }),
+        },
+        Book: {
+          __resolveType: (obj) => {
+            if ("text" in obj) {
+              return "TextBook";
+            }
+            if ("colors" in obj) {
+              return "ColoringBook";
+            }
+            throw new Error("Could not resolve type");
           },
-        }),
-      },
-      Book: {
-        __resolveType: (obj) => {
-          if ("text" in obj) {
-            return "TextBook";
-          }
-          if ("colors" in obj) {
-            return "ColoringBook";
-          }
-          throw new Error("Could not resolve type");
         },
       },
     });
@@ -1048,7 +1050,7 @@ describe("schema proxy", () => {
         },
       });
 
-      using _fetch = createSchemaFetch(resetTestSchema);
+      using _fetch = createSchemaFetch(resetTestSchema).mockGlobal();
 
       const client = new ApolloClient({
         cache: new InMemoryCache(),
@@ -1130,7 +1132,7 @@ describe("schema proxy", () => {
 
       resetTestSchema.reset();
 
-      using _fetch = createSchemaFetch(resetTestSchema);
+      using _fetch = createSchemaFetch(resetTestSchema).mockGlobal();
 
       const client = new ApolloClient({
         cache: new InMemoryCache(),

diff --git a/src/testing/core/createTestSchema.ts b/src/testing/core/createTestSchema.ts
@@ -76,7 +76,9 @@ const createTestSchema = (
 
     fork: ({ resolvers: newResolvers } = {}) => {
       return createTestSchema(targetSchema, {
-        resolvers: newResolvers ?? targetResolvers,
+        // @ts-ignore TODO(fixme): IResolvers type does not play well with our Resolvers
+        resolvers:
+          mergeResolvers([targetResolvers, newResolvers]) ?? targetResolvers,
         scalars: options.scalars,
       });
     },