mute deprecation warnings in tests, fix one missed invariant warning

Author: phryneas

src/core/__tests__/ObservableQuery.ts

@@ -27,7 +27,10 @@ import { expectTypeOf } from "expect-type";
 import { SubscriptionObserver } from "zen-observable-ts";
 import { waitFor } from "@testing-library/react";
 import { ObservableStream, spyOnConsole } from "../../testing/internal";
-import { muteDeprecations } from "../../utilities/deprecation";
+import {
+  muteDeprecations,
+  withDisabledDeprecations,
+} from "../../utilities/deprecation";
 
 export const mockFetchQuery = (queryManager: QueryManager<any>) => {
   const fetchConcastWithInfo = queryManager["fetchConcastWithInfo"];
@@ -1827,6 +1830,7 @@ describe("ObservableQuery", () => {
 
       it("should warn if passed { variables } and query does not declare $variables", async () => {
         using _ = spyOnConsole("warn");
+        using __ = withDisabledDeprecations();
 
         const queryWithVarsVar = gql`
           query QueryWithVarsVar($vars: [String!]) {

src/link/core/ApolloLink.ts

@@ -14,6 +14,7 @@ import {
   createOperation,
   transformOperation,
 } from "../utils/index.js";
+import { warnDeprecated } from "../../utilities/deprecation/index.js";
 
 function passthrough(op: Operation, forward: NextLink) {
   return (forward ? forward(op) : Observable.of()) as Observable<FetchResult>;
@@ -145,9 +146,11 @@ export class ApolloLink {
     observer?: Observer<FetchResult>
   ): false | void {
     if (__DEV__) {
-      invariant.warn(
-        "[ApolloLink] `onError` is deprecated and will be removed with Apollo Client 4.0. Please discontinue using it."
-      );
+      warnDeprecated("onError", () => {
+        invariant.warn(
+          "[ApolloLink] `onError` is deprecated and will be removed with Apollo Client 4.0. Please discontinue using it."
+        );
+      });
     }
     if (observer && observer.error) {
       observer.error(error);

src/testing/react/__tests__/MockedProvider.test.tsx

@@ -11,6 +11,7 @@ import { QueryResult } from "../../../react/types/types";
 import { ApolloLink, FetchResult } from "../../../link/core";
 import { Observable } from "zen-observable-ts";
 import { ApolloError } from "../../../errors";
+import { withDisabledDeprecations } from "../../../utilities/deprecation";
 
 const variables = {
   username: "mock_username",
@@ -870,6 +871,8 @@ describe("General use", () => {
 
   it("shows a warning in the console when there is no matched mock", async () => {
     const consoleSpy = jest.spyOn(console, "warn").mockImplementation(() => {});
+
+    using _ = withDisabledDeprecations();
     let finished = false;
     function Component({ ...variables }: Variables) {
       const { loading } = useQuery<Data, Variables>(query, { variables });
@@ -915,6 +918,7 @@ describe("General use", () => {
 
   it("silences console warning for unmatched mocks when `showWarnings` is `false`", async () => {
     const consoleSpy = jest.spyOn(console, "warn");
+    using _ = withDisabledDeprecations();
     let finished = false;
     function Component({ ...variables }: Variables) {
       const { loading } = useQuery<Data, Variables>(query, { variables });
@@ -957,6 +961,7 @@ describe("General use", () => {
 
   it("silences console warning for unmatched mocks when passing `showWarnings` to `MockLink` directly", async () => {
     const consoleSpy = jest.spyOn(console, "warn");
+    using _ = withDisabledDeprecations();
     let finished = false;
     function Component({ ...variables }: Variables) {
       const { loading } = useQuery<Data, Variables>(query, { variables });

src/utilities/deprecation/index.ts

@@ -1,5 +1,8 @@
 import { Slot } from "optimism";
-import { invariant, global } from "../globals/index.js";
+import { invariant, global as untypedGlobal } from "../globals/index.js";
+
+const muteAllDeprecations = Symbol.for("apollo.deprecations");
+const global = untypedGlobal as { [muteAllDeprecations]?: boolean };
 
 const slot = new Slot<string[]>();
 
@@ -92,10 +95,7 @@ export type DeprecationName =
   | NonNullable<PossibleDeprecations[keyof PossibleDeprecations]>[number];
 
 function isMuted(name: DeprecationName) {
-  return (
-    !!(global as any)[Symbol.for("apollo.deprecations")] ||
-    (slot.getValue() || []).includes(name)
-  );
+  return global[muteAllDeprecations] || (slot.getValue() || []).includes(name);
 }
 
 export function muteDeprecations<TResult, TArgs extends any[], TThis = any>(
@@ -131,3 +131,13 @@ export function warnDeprecated(name: DeprecationName, cb: () => void) {
     cb();
   }
 }
+
+export function withDisabledDeprecations() {
+  const prev = global[muteAllDeprecations];
+  global[muteAllDeprecations] = true;
+  return {
+    [Symbol.dispose]() {
+      global[muteAllDeprecations] = prev;
+    },
+  };
+}