From 5d6a0692d5fa3f7c2c9ec4a078d231014e75a22f Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 5 Apr 2024 11:12:16 -0400
Subject: [PATCH 01/13] feat: deep merge resolvers by default

---
 package-lock.json                             |  1 +
 package.json                                  |  1 +
 .../__tests__/createProxiedSchema.test.tsx    | 13 ++++++----
 src/testing/core/createProxiedSchema.ts       | 26 +++++++++++++++----
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 21f6f038d9e..b8a3a86d396 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,6 +30,7 @@
         "@babel/parser": "7.24.1",
         "@changesets/changelog-github": "0.5.0",
         "@changesets/cli": "2.27.1",
+        "@graphql-tools/merge": "^9.0.3",
         "@graphql-tools/schema": "10.0.3",
         "@graphql-tools/utils": "10.0.13",
         "@microsoft/api-extractor": "7.42.3",
diff --git a/package.json b/package.json
index bbab1a55392..43676ccc64c 100644
--- a/package.json
+++ b/package.json
@@ -111,6 +111,7 @@
     "@babel/parser": "7.24.1",
     "@changesets/changelog-github": "0.5.0",
     "@changesets/cli": "2.27.1",
+    "@graphql-tools/merge": "^9.0.3",
     "@graphql-tools/schema": "10.0.3",
     "@graphql-tools/utils": "10.0.13",
     "@microsoft/api-extractor": "7.42.3",
diff --git a/src/testing/core/__tests__/createProxiedSchema.test.tsx b/src/testing/core/__tests__/createProxiedSchema.test.tsx
index dc5f686f8c7..b10b0121f0e 100644
--- a/src/testing/core/__tests__/createProxiedSchema.test.tsx
+++ b/src/testing/core/__tests__/createProxiedSchema.test.tsx
@@ -346,7 +346,7 @@ describe("schema proxy", () => {
     unmount();
   });
 
-  it("does not pollute the original schema", async () => {
+  it("schema.fork does not pollute the original schema", async () => {
     const Profiler = createDefaultProfiler<ViewerQueryData>();
 
     using _fetch = createMockFetch(schema);
@@ -861,6 +861,7 @@ describe("schema proxy", () => {
       },
       Book: {
         __resolveType: (obj) => {
+          console.log(obj);
           if ("text" in obj) {
             return "TextBook";
           }
@@ -876,10 +877,9 @@ describe("schema proxy", () => {
       resolvers: {
         Query: {
           viewer: () => ({
-            name: "Virginia",
             book: {
               colors: ["red", "blue", "green"],
-              title: "The Book",
+              title: "A New Book",
             },
           }),
         },
@@ -997,7 +997,7 @@ describe("schema proxy", () => {
             colors: ["red", "blue", "green"],
             id: "1",
             publishedAt: "2024-01-01",
-            title: "The Book",
+            title: "A New Book",
           },
         },
       });
@@ -1020,7 +1020,7 @@ describe("schema proxy", () => {
             colors: ["red", "blue", "green"],
             id: "1",
             publishedAt: "2024-01-01",
-            title: "The Book",
+            title: "A New Book",
           },
         },
       });
@@ -1028,4 +1028,7 @@ describe("schema proxy", () => {
 
     unmount();
   });
+  it.todo("add test for reset");
+  it.todo("add test for mergeResolvers: false");
+  it.todo("add test for mergeResolvers: true");
 });
diff --git a/src/testing/core/createProxiedSchema.ts b/src/testing/core/createProxiedSchema.ts
index e3ceaec2043..6d8e59e4bca 100644
--- a/src/testing/core/createProxiedSchema.ts
+++ b/src/testing/core/createProxiedSchema.ts
@@ -1,6 +1,6 @@
-import { addResolversToSchema } from "@graphql-tools/schema";
 import type { GraphQLSchema } from "graphql";
-
+import { addResolversToSchema } from "@graphql-tools/schema";
+import { mergeResolvers } from "@graphql-tools/merge";
 import type { Resolvers } from "../../core/types.js";
 
 type ProxiedSchema = GraphQLSchema & ProxiedSchemaFns;
@@ -11,6 +11,10 @@ interface ProxiedSchemaFns {
   reset: () => void;
 }
 
+type CreateProxiedSchemaOptions = {
+  mergeResolvers: boolean;
+};
+
 /**
  * A function that creates a [Proxy object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy)
  * around a given `schema` with `resolvers`. This proxied schema can be used to
@@ -45,7 +49,10 @@ interface ProxiedSchemaFns {
  */
 const createProxiedSchema = (
   schemaWithMocks: GraphQLSchema,
-  resolvers: Resolvers
+  resolvers: Resolvers,
+  options: CreateProxiedSchemaOptions = {
+    mergeResolvers: true,
+  }
 ): ProxiedSchema => {
   let targetResolvers = { ...resolvers };
   let targetSchema = addResolversToSchema({
@@ -55,7 +62,12 @@ const createProxiedSchema = (
 
   const fns: ProxiedSchemaFns = {
     add: ({ resolvers: newResolvers }) => {
-      targetResolvers = { ...targetResolvers, ...newResolvers };
+      // @ts-ignore TODO: fix this
+      targetResolvers =
+        options.mergeResolvers ?
+          mergeResolvers([targetResolvers, newResolvers])
+        : { ...targetResolvers, ...newResolvers };
+
       targetSchema = addResolversToSchema({
         schema: targetSchema,
         resolvers: targetResolvers,
@@ -65,7 +77,11 @@ const createProxiedSchema = (
     },
 
     fork: ({ resolvers: newResolvers } = {}) => {
-      return createProxiedSchema(targetSchema, newResolvers ?? targetResolvers);
+      return createProxiedSchema(
+        targetSchema,
+        newResolvers ?? targetResolvers,
+        options
+      );
     },
 
     reset: () => {

From 912220af2f06389278b36be5f3866ca00aa968dd Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 5 Apr 2024 12:55:01 -0400
Subject: [PATCH 02/13] chore: add changeset

---
 .changeset/cold-dancers-call.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/cold-dancers-call.md

diff --git a/.changeset/cold-dancers-call.md b/.changeset/cold-dancers-call.md
new file mode 100644
index 00000000000..e9527454bfe
--- /dev/null
+++ b/.changeset/cold-dancers-call.md
@@ -0,0 +1,5 @@
+---
+"@apollo/client": minor
+---
+
+`createProxiedSchema` deep merges resolvers by default, can be opted out of with `mergeResolvers: false`

From 12a5f36049579cf4bcad037064e2cb3cd88ecc57 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Mon, 8 Apr 2024 13:45:39 -0400
Subject: [PATCH 03/13] chore: update comment

---
 src/testing/core/createProxiedSchema.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/testing/core/createProxiedSchema.ts b/src/testing/core/createProxiedSchema.ts
index 6d8e59e4bca..092a7eb6b1f 100644
--- a/src/testing/core/createProxiedSchema.ts
+++ b/src/testing/core/createProxiedSchema.ts
@@ -62,7 +62,7 @@ const createProxiedSchema = (
 
   const fns: ProxiedSchemaFns = {
     add: ({ resolvers: newResolvers }) => {
-      // @ts-ignore TODO: fix this
+      // @ts-ignore TODO(fixme): IResolvers type does not play well with our Resolvers
       targetResolvers =
         options.mergeResolvers ?
           mergeResolvers([targetResolvers, newResolvers])

From 0fb94ccecbe88c598e4baab13b773fdfb303c610 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Wed, 10 Apr 2024 09:12:13 -0400
Subject: [PATCH 04/13] chore: add reset test, remove option

---
 .../__tests__/createProxiedSchema.test.tsx    | 209 +++++++++++++++++-
 src/testing/core/createProxiedSchema.ts       |  20 +-
 2 files changed, 208 insertions(+), 21 deletions(-)

diff --git a/src/testing/core/__tests__/createProxiedSchema.test.tsx b/src/testing/core/__tests__/createProxiedSchema.test.tsx
index b10b0121f0e..7128b69825b 100644
--- a/src/testing/core/__tests__/createProxiedSchema.test.tsx
+++ b/src/testing/core/__tests__/createProxiedSchema.test.tsx
@@ -861,7 +861,6 @@ describe("schema proxy", () => {
       },
       Book: {
         __resolveType: (obj) => {
-          console.log(obj);
           if ("text" in obj) {
             return "TextBook";
           }
@@ -1028,7 +1027,209 @@ describe("schema proxy", () => {
 
     unmount();
   });
-  it.todo("add test for reset");
-  it.todo("add test for mergeResolvers: false");
-  it.todo("add test for mergeResolvers: true");
+
+  describe("schema.reset", () => {
+    const resetTestSchema = createProxiedSchema(schemaWithMocks, {
+      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");
+        },
+      },
+    });
+    it("setup test where we add resolvers to schema", async () => {
+      const Profiler = createDefaultProfiler<ViewerQueryData>();
+
+      resetTestSchema.add({
+        resolvers: {
+          Query: {
+            viewer: () => ({
+              book: {
+                text: "Hello World",
+                title: "The Waves",
+              },
+            }),
+          },
+        },
+      });
+
+      using _fetch = createMockFetch(resetTestSchema);
+
+      const client = new ApolloClient({
+        cache: new InMemoryCache(),
+        uri,
+      });
+
+      const query: TypedDocumentNode<ViewerQueryData> = gql`
+        query {
+          viewer {
+            id
+            name
+            age
+            book {
+              id
+              title
+              publishedAt
+              ... on ColoringBook {
+                colors
+              }
+            }
+          }
+        }
+      `;
+
+      const Fallback = () => {
+        useTrackRenders();
+        return <div>Loading...</div>;
+      };
+
+      const App = () => {
+        return (
+          <React.Suspense fallback={<Fallback />}>
+            <Child />
+          </React.Suspense>
+        );
+      };
+
+      const Child = () => {
+        const result = useSuspenseQuery(query);
+
+        useTrackRenders();
+
+        Profiler.mergeSnapshot({
+          result,
+        } as Partial<{}>);
+
+        return <div>Hello</div>;
+      };
+
+      const { unmount } = renderWithClient(<App />, {
+        client,
+        wrapper: Profiler,
+      });
+
+      // initial suspended render
+      await Profiler.takeRender();
+
+      {
+        const { snapshot } = await Profiler.takeRender();
+
+        expect(snapshot.result?.data).toEqual({
+          viewer: {
+            __typename: "User",
+            age: 42,
+            id: "1",
+            name: "String",
+            book: {
+              __typename: "TextBook",
+              id: "1",
+              publishedAt: "2024-01-01",
+              // value set in this test with .add
+              title: "The Waves",
+            },
+          },
+        });
+      }
+
+      unmount();
+    });
+    it("resets the schema to the original", async () => {
+      const Profiler = createDefaultProfiler<ViewerQueryData>();
+
+      resetTestSchema.reset();
+
+      using _fetch = createMockFetch(resetTestSchema);
+
+      const client = new ApolloClient({
+        cache: new InMemoryCache(),
+        uri,
+      });
+
+      const query: TypedDocumentNode<ViewerQueryData> = gql`
+        query {
+          viewer {
+            id
+            name
+            age
+            book {
+              id
+              title
+              publishedAt
+              ... on ColoringBook {
+                colors
+              }
+            }
+          }
+        }
+      `;
+
+      const Fallback = () => {
+        useTrackRenders();
+        return <div>Loading...</div>;
+      };
+
+      const App = () => {
+        return (
+          <React.Suspense fallback={<Fallback />}>
+            <Child />
+          </React.Suspense>
+        );
+      };
+
+      const Child = () => {
+        const result = useSuspenseQuery(query);
+
+        useTrackRenders();
+
+        Profiler.mergeSnapshot({
+          result,
+        } as Partial<{}>);
+
+        return <div>Hello</div>;
+      };
+
+      const { unmount } = renderWithClient(<App />, {
+        client,
+        wrapper: Profiler,
+      });
+
+      // initial suspended render
+      await Profiler.takeRender();
+
+      {
+        const { snapshot } = await Profiler.takeRender();
+
+        expect(snapshot.result?.data).toEqual({
+          viewer: {
+            __typename: "User",
+            age: 42,
+            id: "1",
+            name: "String",
+            book: {
+              __typename: "TextBook",
+              id: "1",
+              publishedAt: "2024-01-01",
+              // original value
+              title: "Orlando: A Biography",
+            },
+          },
+        });
+      }
+
+      unmount();
+    });
+  });
 });
diff --git a/src/testing/core/createProxiedSchema.ts b/src/testing/core/createProxiedSchema.ts
index 092a7eb6b1f..26b792532d7 100644
--- a/src/testing/core/createProxiedSchema.ts
+++ b/src/testing/core/createProxiedSchema.ts
@@ -11,10 +11,6 @@ interface ProxiedSchemaFns {
   reset: () => void;
 }
 
-type CreateProxiedSchemaOptions = {
-  mergeResolvers: boolean;
-};
-
 /**
  * A function that creates a [Proxy object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy)
  * around a given `schema` with `resolvers`. This proxied schema can be used to
@@ -49,10 +45,7 @@ type CreateProxiedSchemaOptions = {
  */
 const createProxiedSchema = (
   schemaWithMocks: GraphQLSchema,
-  resolvers: Resolvers,
-  options: CreateProxiedSchemaOptions = {
-    mergeResolvers: true,
-  }
+  resolvers: Resolvers
 ): ProxiedSchema => {
   let targetResolvers = { ...resolvers };
   let targetSchema = addResolversToSchema({
@@ -63,10 +56,7 @@ const createProxiedSchema = (
   const fns: ProxiedSchemaFns = {
     add: ({ resolvers: newResolvers }) => {
       // @ts-ignore TODO(fixme): IResolvers type does not play well with our Resolvers
-      targetResolvers =
-        options.mergeResolvers ?
-          mergeResolvers([targetResolvers, newResolvers])
-        : { ...targetResolvers, ...newResolvers };
+      targetResolvers = mergeResolvers([targetResolvers, newResolvers]);
 
       targetSchema = addResolversToSchema({
         schema: targetSchema,
@@ -77,11 +67,7 @@ const createProxiedSchema = (
     },
 
     fork: ({ resolvers: newResolvers } = {}) => {
-      return createProxiedSchema(
-        targetSchema,
-        newResolvers ?? targetResolvers,
-        options
-      );
+      return createProxiedSchema(targetSchema, newResolvers ?? targetResolvers);
     },
 
     reset: () => {

From 696a15d0d1961ddbaa4ee3e297d028cb9f892ed1 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Wed, 10 Apr 2024 09:15:35 -0400
Subject: [PATCH 05/13] chore: update changeset

---
 .changeset/cold-dancers-call.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/cold-dancers-call.md b/.changeset/cold-dancers-call.md
index e9527454bfe..8083e019b53 100644
--- a/.changeset/cold-dancers-call.md
+++ b/.changeset/cold-dancers-call.md
@@ -2,4 +2,4 @@
 "@apollo/client": minor
 ---
 
-`createProxiedSchema` deep merges resolvers by default, can be opted out of with `mergeResolvers: false`
+`createProxiedSchema` now uses graphql-tools `mergeResolvers` to merge resolvers instead of a shallow merge.

From c10dd8bd9f4876a39e42cece6c2aa457f79b096e Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Wed, 10 Apr 2024 10:07:48 -0400
Subject: [PATCH 06/13] chore: update changeset

---
 .changeset/cold-dancers-call.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/cold-dancers-call.md b/.changeset/cold-dancers-call.md
index 8083e019b53..08885f636e3 100644
--- a/.changeset/cold-dancers-call.md
+++ b/.changeset/cold-dancers-call.md
@@ -2,4 +2,4 @@
 "@apollo/client": minor
 ---
 
-`createProxiedSchema` now uses graphql-tools `mergeResolvers` to merge resolvers instead of a shallow merge.
+`createTestSchema` now uses graphql-tools `mergeResolvers` to merge resolvers instead of a shallow merge.

From ce4f9cd2adbe0f86d6c0db103ff198c3249991e2 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Wed, 10 Apr 2024 11:17:35 -0400
Subject: [PATCH 07/13] fix: update function names in tests

---
 src/testing/core/__tests__/createTestSchema.test.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/testing/core/__tests__/createTestSchema.test.tsx b/src/testing/core/__tests__/createTestSchema.test.tsx
index cde028beefc..68b034313db 100644
--- a/src/testing/core/__tests__/createTestSchema.test.tsx
+++ b/src/testing/core/__tests__/createTestSchema.test.tsx
@@ -1029,7 +1029,7 @@ describe("schema proxy", () => {
   });
 
   describe("schema.reset", () => {
-    const resetTestSchema = createProxiedSchema(schemaWithMocks, {
+    const resetTestSchema = createTestSchema(schemaWithMocks, {
       Query: {
         viewer: () => ({
           book: {
@@ -1066,7 +1066,7 @@ describe("schema proxy", () => {
         },
       });
 
-      using _fetch = createMockFetch(resetTestSchema);
+      using _fetch = createSchemaFetch(resetTestSchema);
 
       const client = new ApolloClient({
         cache: new InMemoryCache(),
@@ -1151,7 +1151,7 @@ describe("schema proxy", () => {
 
       resetTestSchema.reset();
 
-      using _fetch = createMockFetch(resetTestSchema);
+      using _fetch = createSchemaFetch(resetTestSchema);
 
       const client = new ApolloClient({
         cache: new InMemoryCache(),

From 178eb83407b96d3d178193777dffebbe6ea2b1d4 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 12 Apr 2024 08:39:15 -0400
Subject: [PATCH 08/13] fix: remove unused useTrackRenders

---
 .../core/__tests__/createTestSchema.test.tsx  | 34 +------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/testing/core/__tests__/createTestSchema.test.tsx b/src/testing/core/__tests__/createTestSchema.test.tsx
index 68b034313db..f03b475e57a 100644
--- a/src/testing/core/__tests__/createTestSchema.test.tsx
+++ b/src/testing/core/__tests__/createTestSchema.test.tsx
@@ -11,7 +11,6 @@ import {
   createProfiler,
   renderWithClient,
   spyOnConsole,
-  useTrackRenders,
 } from "../../internal/index.js";
 import { createTestSchema } from "../createTestSchema.js";
 import { GraphQLError, buildSchema } from "graphql";
@@ -109,7 +108,6 @@ function createTrackedErrorComponents<Snapshot extends { error: Error | null }>(
   Profiler: Profiler<Snapshot>
 ) {
   function ErrorFallback({ error }: FallbackProps) {
-    useTrackRenders({ name: "ErrorFallback" });
     Profiler.mergeSnapshot({ error } as Partial<Snapshot>);
 
     return <div>Error</div>;
@@ -196,7 +194,6 @@ describe("schema proxy", () => {
     `;
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -211,11 +208,9 @@ describe("schema proxy", () => {
     const Child = () => {
       const result = useSuspenseQuery(query);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
-      } as Partial<{}>);
+      });
 
       return <div>Hello</div>;
     };
@@ -289,7 +284,6 @@ describe("schema proxy", () => {
     `;
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -304,8 +298,6 @@ describe("schema proxy", () => {
     const Child = () => {
       const result = useSuspenseQuery(query);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -372,7 +364,6 @@ describe("schema proxy", () => {
     `;
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -387,8 +378,6 @@ describe("schema proxy", () => {
     const Child = () => {
       const result = useSuspenseQuery(query);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -467,7 +456,6 @@ describe("schema proxy", () => {
     `;
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -482,8 +470,6 @@ describe("schema proxy", () => {
     const Child = () => {
       const result = useSuspenseQuery(query);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -583,7 +569,6 @@ describe("schema proxy", () => {
     `;
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -599,8 +584,6 @@ describe("schema proxy", () => {
       const result = useSuspenseQuery(query);
       const [changeViewerName] = useMutation(mutation);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -717,7 +700,6 @@ describe("schema proxy", () => {
     });
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -734,8 +716,6 @@ describe("schema proxy", () => {
     const Child = () => {
       const result = useSuspenseQuery(query);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -797,7 +777,6 @@ describe("schema proxy", () => {
     });
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -814,8 +793,6 @@ describe("schema proxy", () => {
     const Child = () => {
       const result = useSuspenseQuery(query);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -942,7 +919,6 @@ describe("schema proxy", () => {
     `;
 
     const Fallback = () => {
-      useTrackRenders();
       return <div>Loading...</div>;
     };
 
@@ -958,8 +934,6 @@ describe("schema proxy", () => {
       const result = useSuspenseQuery(query);
       const [changeViewerName] = useMutation(mutation);
 
-      useTrackRenders();
-
       Profiler.mergeSnapshot({
         result,
       } as Partial<{}>);
@@ -1092,7 +1066,6 @@ describe("schema proxy", () => {
       `;
 
       const Fallback = () => {
-        useTrackRenders();
         return <div>Loading...</div>;
       };
 
@@ -1107,8 +1080,6 @@ describe("schema proxy", () => {
       const Child = () => {
         const result = useSuspenseQuery(query);
 
-        useTrackRenders();
-
         Profiler.mergeSnapshot({
           result,
         } as Partial<{}>);
@@ -1177,7 +1148,6 @@ describe("schema proxy", () => {
       `;
 
       const Fallback = () => {
-        useTrackRenders();
         return <div>Loading...</div>;
       };
 
@@ -1192,8 +1162,6 @@ describe("schema proxy", () => {
       const Child = () => {
         const result = useSuspenseQuery(query);
 
-        useTrackRenders();
-
         Profiler.mergeSnapshot({
           result,
         } as Partial<{}>);

From 25872f698a22923cf789968f0b3f72354834a525 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 12 Apr 2024 10:19:24 -0400
Subject: [PATCH 09/13] chore: fix tests post-merge and merge resolvers in
 .fork

---
 .../core/__tests__/createTestSchema.test.tsx  | 40 ++++++++++---------
 src/testing/core/createTestSchema.ts          |  4 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/testing/core/__tests__/createTestSchema.test.tsx b/src/testing/core/__tests__/createTestSchema.test.tsx
index b9823a64d80..a86670b00a7 100644
--- 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
index d2895dacc8c..3a739330807 100644
--- 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,
       });
     },

From b95cad402cf856a0d0b97224901433c56d91dc0e Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 12 Apr 2024 10:38:58 -0400
Subject: [PATCH 10/13] chore: comment out flaky test

---
 src/link/persisted-queries/__tests__/persisted-queries.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/link/persisted-queries/__tests__/persisted-queries.test.ts b/src/link/persisted-queries/__tests__/persisted-queries.test.ts
index e970af26d6f..92e463af08b 100644
--- a/src/link/persisted-queries/__tests__/persisted-queries.test.ts
+++ b/src/link/persisted-queries/__tests__/persisted-queries.test.ts
@@ -544,7 +544,7 @@ describe("failure path", () => {
   );
 
   it.each([
-    ["error message", giveUpResponse],
+    // ["error message", giveUpResponse],
     ["error code", giveUpResponseWithCode],
   ] as const)(
     "clears the cache when receiving NotSupported error (%s)",

From 712d3383f626c7d009a7d8b0553678993e5b4713 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 12 Apr 2024 10:39:41 -0400
Subject: [PATCH 11/13] chore: update comment with link to issue

---
 src/link/persisted-queries/__tests__/persisted-queries.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/link/persisted-queries/__tests__/persisted-queries.test.ts b/src/link/persisted-queries/__tests__/persisted-queries.test.ts
index 92e463af08b..7b4fecaf99f 100644
--- a/src/link/persisted-queries/__tests__/persisted-queries.test.ts
+++ b/src/link/persisted-queries/__tests__/persisted-queries.test.ts
@@ -544,6 +544,7 @@ describe("failure path", () => {
   );
 
   it.each([
+    // TODO(fixme): test flake on CI https://github.com/apollographql/apollo-client/issues/11782
     // ["error message", giveUpResponse],
     ["error code", giveUpResponseWithCode],
   ] as const)(

From 0d492737c589c5878d2daaf3a8264e485ff57d41 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Fri, 12 Apr 2024 11:10:59 -0400
Subject: [PATCH 12/13] commit failing test

---
 .../core/__tests__/createTestSchema.test.tsx  | 290 +++++++-----------
 src/testing/internal/profile/profile.tsx      |  18 +-
 2 files changed, 127 insertions(+), 181 deletions(-)

diff --git a/src/testing/core/__tests__/createTestSchema.test.tsx b/src/testing/core/__tests__/createTestSchema.test.tsx
index a86670b00a7..f5444faa76d 100644
--- a/src/testing/core/__tests__/createTestSchema.test.tsx
+++ b/src/testing/core/__tests__/createTestSchema.test.tsx
@@ -215,7 +215,7 @@ describe("schema proxy", () => {
       return <div>Hello</div>;
     };
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -241,8 +241,6 @@ describe("schema proxy", () => {
         },
       });
     }
-
-    unmount();
   });
 
   it("allows schema forking with .fork", async () => {
@@ -305,7 +303,7 @@ describe("schema proxy", () => {
       return <div>Hello</div>;
     };
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -334,13 +332,24 @@ describe("schema proxy", () => {
         },
       });
     }
-
-    unmount();
   });
 
   it("schema.fork does not pollute the original schema", async () => {
     const Profiler = createDefaultProfiler<ViewerQueryData>();
 
+    schema.fork({
+      resolvers: {
+        Query: {
+          viewer: () => ({
+            book: {
+              colors: ["red", "blue", "green"],
+              title: "The Book",
+            },
+          }),
+        },
+      },
+    });
+
     using _fetch = createSchemaFetch(schema).mockGlobal();
 
     const client = new ApolloClient({
@@ -385,7 +394,7 @@ describe("schema proxy", () => {
       return <div>Hello</div>;
     };
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -411,8 +420,6 @@ describe("schema proxy", () => {
         },
       });
     }
-
-    unmount();
   });
 
   it("allows you to call .fork without providing resolvers", async () => {
@@ -477,7 +484,7 @@ describe("schema proxy", () => {
       return <div>Hello</div>;
     };
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -506,8 +513,6 @@ describe("schema proxy", () => {
         },
       });
     }
-
-    unmount();
   });
 
   it("handles mutations", async () => {
@@ -598,7 +603,7 @@ describe("schema proxy", () => {
 
     const user = userEvent.setup();
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -649,8 +654,6 @@ describe("schema proxy", () => {
         },
       });
     }
-
-    unmount();
   });
 
   it("returns GraphQL errors", async () => {
@@ -723,7 +726,7 @@ describe("schema proxy", () => {
       return <div>Hello</div>;
     };
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -740,8 +743,6 @@ describe("schema proxy", () => {
         })
       );
     }
-
-    unmount();
   });
 
   it("validates schema by default and returns validation errors", async () => {
@@ -800,7 +801,7 @@ describe("schema proxy", () => {
       return <div>Hello</div>;
     };
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -819,8 +820,6 @@ describe("schema proxy", () => {
         })
       );
     }
-
-    unmount();
   });
 
   it("preserves resolvers from previous calls to .add on subsequent calls to .fork", async () => {
@@ -956,7 +955,7 @@ describe("schema proxy", () => {
 
     const user = userEvent.setup();
 
-    const { unmount } = renderWithClient(<App />, {
+    renderWithClient(<App />, {
       client,
       wrapper: Profiler,
     });
@@ -1006,11 +1005,9 @@ describe("schema proxy", () => {
         },
       });
     }
-
-    unmount();
   });
 
-  describe("schema.reset", () => {
+  it.only("resets the schema with schema.reset()", async () => {
     const resetTestSchema = createTestSchema(schema, {
       resolvers: {
         Query: {
@@ -1034,180 +1031,127 @@ describe("schema proxy", () => {
         },
       },
     });
-    it("setup test where we add resolvers to schema", async () => {
-      const Profiler = createDefaultProfiler<ViewerQueryData>();
-
-      resetTestSchema.add({
-        resolvers: {
-          Query: {
-            viewer: () => ({
-              book: {
-                text: "Hello World",
-                title: "The Waves",
-              },
-            }),
-          },
+    const Profiler = createDefaultProfiler<ViewerQueryData>();
+
+    resetTestSchema.add({
+      resolvers: {
+        Query: {
+          viewer: () => ({
+            book: {
+              text: "Hello World",
+              title: "The Waves",
+            },
+          }),
         },
-      });
+      },
+    });
 
-      using _fetch = createSchemaFetch(resetTestSchema).mockGlobal();
+    using _fetch = createSchemaFetch(resetTestSchema).mockGlobal();
 
-      const client = new ApolloClient({
-        cache: new InMemoryCache(),
-        uri,
-      });
+    const client = new ApolloClient({
+      cache: new InMemoryCache(),
+      uri,
+    });
 
-      const query: TypedDocumentNode<ViewerQueryData> = gql`
-        query {
-          viewer {
+    const query: TypedDocumentNode<ViewerQueryData> = gql`
+      query {
+        viewer {
+          id
+          name
+          age
+          book {
             id
-            name
-            age
-            book {
-              id
-              title
-              publishedAt
-              ... on ColoringBook {
-                colors
-              }
+            title
+            publishedAt
+            ... on ColoringBook {
+              colors
             }
           }
         }
-      `;
-
-      const Fallback = () => {
-        return <div>Loading...</div>;
-      };
+      }
+    `;
 
-      const App = () => {
-        return (
-          <React.Suspense fallback={<Fallback />}>
-            <Child />
-          </React.Suspense>
-        );
-      };
+    const Fallback = () => {
+      return <div>Loading...</div>;
+    };
 
-      const Child = () => {
-        const result = useSuspenseQuery(query);
+    const App = () => {
+      return (
+        <React.Suspense fallback={<Fallback />}>
+          <Child />
+        </React.Suspense>
+      );
+    };
 
-        Profiler.mergeSnapshot({
-          result,
-        } as Partial<{}>);
+    const Child = () => {
+      const result = useSuspenseQuery(query);
+      console.log(result.data);
+      Profiler.mergeSnapshot({
+        result,
+      } as Partial<{}>);
 
-        return <div>Hello</div>;
-      };
+      return (
+        <div>
+          Hello<button onClick={() => result.refetch()}>Refetch</button>
+        </div>
+      );
+    };
 
-      const { unmount } = renderWithClient(<App />, {
-        client,
-        wrapper: Profiler,
-      });
+    renderWithClient(<App />, {
+      client,
+      wrapper: Profiler,
+    });
 
-      // initial suspended render
-      await Profiler.takeRender();
+    // initial suspended render
+    await Profiler.takeRender();
 
-      {
-        const { snapshot } = await Profiler.takeRender();
+    {
+      const { snapshot } = await Profiler.takeRender();
 
-        expect(snapshot.result?.data).toEqual({
-          viewer: {
-            __typename: "User",
-            age: 42,
+      expect(snapshot.result?.data).toEqual({
+        viewer: {
+          __typename: "User",
+          age: 42,
+          id: "1",
+          name: "String",
+          book: {
+            __typename: "TextBook",
             id: "1",
-            name: "String",
-            book: {
-              __typename: "TextBook",
-              id: "1",
-              publishedAt: "2024-01-01",
-              // value set in this test with .add
-              title: "The Waves",
-            },
+            publishedAt: "2024-01-01",
+            // value set in this test with .add
+            title: "The Waves",
           },
-        });
-      }
-
-      unmount();
-    });
-    it("resets the schema to the original", async () => {
-      const Profiler = createDefaultProfiler<ViewerQueryData>();
-
-      resetTestSchema.reset();
-
-      using _fetch = createSchemaFetch(resetTestSchema).mockGlobal();
-
-      const client = new ApolloClient({
-        cache: new InMemoryCache(),
-        uri,
+        },
       });
+    }
 
-      const query: TypedDocumentNode<ViewerQueryData> = gql`
-        query {
-          viewer {
-            id
-            name
-            age
-            book {
-              id
-              title
-              publishedAt
-              ... on ColoringBook {
-                colors
-              }
-            }
-          }
-        }
-      `;
-
-      const Fallback = () => {
-        return <div>Loading...</div>;
-      };
-
-      const App = () => {
-        return (
-          <React.Suspense fallback={<Fallback />}>
-            <Child />
-          </React.Suspense>
-        );
-      };
-
-      const Child = () => {
-        const result = useSuspenseQuery(query);
-
-        Profiler.mergeSnapshot({
-          result,
-        } as Partial<{}>);
+    resetTestSchema.reset();
 
-        return <div>Hello</div>;
-      };
+    const user = userEvent.setup();
 
-      const { unmount } = renderWithClient(<App />, {
-        client,
-        wrapper: Profiler,
-      });
+    await act(() => user.click(screen.getByText("Refetch")));
 
-      // initial suspended render
-      await Profiler.takeRender();
+    // initial suspended render
+    await Profiler.takeRender();
 
-      {
-        const { snapshot } = await Profiler.takeRender();
+    {
+      const { snapshot } = await Profiler.takeRender();
 
-        expect(snapshot.result?.data).toEqual({
-          viewer: {
-            __typename: "User",
-            age: 42,
+      expect(snapshot.result?.data).toEqual({
+        viewer: {
+          __typename: "User",
+          age: 42,
+          id: "1",
+          name: "String",
+          book: {
+            __typename: "TextBook",
             id: "1",
-            name: "String",
-            book: {
-              __typename: "TextBook",
-              id: "1",
-              publishedAt: "2024-01-01",
-              // original value
-              title: "Orlando: A Biography",
-            },
+            publishedAt: "2024-01-01",
+            // original value
+            title: "Orlando: A Biography",
           },
-        });
-      }
-
-      unmount();
-    });
+        },
+      });
+    }
   });
 });
diff --git a/src/testing/internal/profile/profile.tsx b/src/testing/internal/profile/profile.tsx
index 12e681ad7d2..b9e82619534 100644
--- a/src/testing/internal/profile/profile.tsx
+++ b/src/testing/internal/profile/profile.tsx
@@ -151,6 +151,9 @@ export function createProfiler<Snapshot extends ValidSnapshot = void>({
   let nextRender: Promise<Render<Snapshot>> | undefined;
   let resolveNextRender: ((render: Render<Snapshot>) => void) | undefined;
   let rejectNextRender: ((error: unknown) => void) | undefined;
+  function resetNextRender() {
+    nextRender = resolveNextRender = rejectNextRender = undefined;
+  }
   const snapshotRef = { current: initialSnapshot };
   const replaceSnapshot: ReplaceSnapshot<Snapshot> = (snap) => {
     if (typeof snap === "function") {
@@ -241,7 +244,7 @@ export function createProfiler<Snapshot extends ValidSnapshot = void>({
       });
       rejectNextRender?.(error);
     } finally {
-      nextRender = resolveNextRender = rejectNextRender = undefined;
+      resetNextRender();
     }
   };
 
@@ -340,13 +343,12 @@ export function createProfiler<Snapshot extends ValidSnapshot = void>({
               rejectNextRender = reject;
             }),
             new Promise<Render<Snapshot>>((_, reject) =>
-              setTimeout(
-                () =>
-                  reject(
-                    applyStackTrace(new WaitForRenderTimeoutError(), stackTrace)
-                  ),
-                timeout
-              )
+              setTimeout(() => {
+                reject(
+                  applyStackTrace(new WaitForRenderTimeoutError(), stackTrace)
+                );
+                resetNextRender();
+              }, timeout)
             ),
           ]);
         }

From c6eaea4f5b7021937e1f5cdc2a53c9875aa1daa9 Mon Sep 17 00:00:00 2001
From: Alessia Bellisario <github@bellisar.io>
Date: Mon, 15 Apr 2024 16:58:12 -0400
Subject: [PATCH 13/13] chore: remove old comment

---
 src/testing/experimental/__tests__/createTestSchema.test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/testing/experimental/__tests__/createTestSchema.test.tsx b/src/testing/experimental/__tests__/createTestSchema.test.tsx
index b6f8321434a..99b579ddde2 100644
--- a/src/testing/experimental/__tests__/createTestSchema.test.tsx
+++ b/src/testing/experimental/__tests__/createTestSchema.test.tsx
@@ -1135,7 +1135,6 @@ describe("schema proxy", () => {
     // initial suspended render
     await Profiler.takeRender();
 
-    // no initial suspended render
     {
       const { snapshot } = await Profiler.takeRender();