graphql-data-generator 0.3.0-alpha.24 → 0.3.0-alpha.26

package/esm/jest.js

@@ -6,15 +6,30 @@ import { MockedProvider as ApolloMockedProvider, MockLink, } from "@apollo/clien
 import { waitFor } from "@testing-library/dom";
 import { Kind, print } from "graphql";
 import { diff as jestDiff } from "jest-diff";
+import "@testing-library/react/dont-cleanup-after-each";
+import { cleanup } from "@testing-library/react";
 let currentSpecResult;
 jasmine.getEnv().addReporter({
     specStarted: (result) => currentSpecResult = result,
 });
+let _skipCleanupAfterEach = false;
+/**
+ * `@testing-library/react` automatically unmounts React trees that were mounted
+ * with render after each test, which `graphql-data-generator` hijacks to ensure
+ * cleanup is done after all mocks are consumed. Invoke this functions to
+ * disable automatic cleanup.
+ * @param value
+ */
+export const skipCleanupAfterEach = (value = false) => {
+    _skipCleanupAfterEach = value;
+};
 const afterTest = [];
 afterEach(async () => {
     const hooks = afterTest.splice(0);
     for (const hook of hooks)
         await hook();
+    if (!_skipCleanupAfterEach)
+        cleanup();
 });
 const diff = (a, b) => jestDiff(a, b, { omitAnnotationLines: true })
     ?.replace(/\w+ \{/g, "{") // Remove class names
@@ -201,14 +216,13 @@ export const MockedProvider = ({ mocks, stack: renderStack, children, link: pass
     if (_failRefetchWarnings) {
         const oldWarn = console.warn.bind(console.warn);
         console.warn = (message, operation, ...etc) => {
-            if (message !==
-                'Unknown query named "%s" requested in refetchQueries in options.include array') {
+            if (typeof message !== "string" ||
+                !message.match(/Unknown query named.*refetchQueries/))
                 return oldWarn(message, operation, ...etc);
-            }
             try {
                 fail({
                     name: "Error",
-                    message: `Expected query ${operation} requested in refetchQueries options.include array to have bene mocked`,
+                    message: `Expected query ${operation} requested in refetchQueries options.include array to have been mocked`,
                     stack: renderStack,
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-data-generator",
-  "version": "0.3.0-alpha.24",
+  "version": "0.3.0-alpha.26",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voces/graphql-data-generator.git"
@@ -61,7 +61,8 @@
     "react": "*",
     "@types/react": "*",
     "@apollo/client": "*",
-    "@testing-library/dom": "*"
+    "@testing-library/dom": "*",
+    "@testing-library/react": "*"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -75,6 +76,9 @@
     },
     "@testing-library/dom": {
       "optional": true
+    },
+    "@testing-library/react": {
+      "optional": true
     }
   }
 }

package/script/jest.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockedProvider = exports.waitForMocks = exports.allowMissingMocks = exports.failRefetchWarnings = void 0;
+exports.MockedProvider = exports.waitForMocks = exports.allowMissingMocks = exports.failRefetchWarnings = exports.skipCleanupAfterEach = void 0;
 const dntShim = __importStar(require("./_dnt.shims.js"));
 const react_1 = __importStar(require("react"));
 const client_1 = require("@apollo/client");
@@ -32,15 +32,31 @@ const testing_1 = require("@apollo/client/testing");
 const dom_1 = require("@testing-library/dom");
 const graphql_1 = require("graphql");
 const jest_diff_1 = require("jest-diff");
+require("@testing-library/react/dont-cleanup-after-each");
+const react_2 = require("@testing-library/react");
 let currentSpecResult;
 jasmine.getEnv().addReporter({
     specStarted: (result) => currentSpecResult = result,
 });
+let _skipCleanupAfterEach = false;
+/**
+ * `@testing-library/react` automatically unmounts React trees that were mounted
+ * with render after each test, which `graphql-data-generator` hijacks to ensure
+ * cleanup is done after all mocks are consumed. Invoke this functions to
+ * disable automatic cleanup.
+ * @param value
+ */
+const skipCleanupAfterEach = (value = false) => {
+    _skipCleanupAfterEach = value;
+};
+exports.skipCleanupAfterEach = skipCleanupAfterEach;
 const afterTest = [];
 afterEach(async () => {
     const hooks = afterTest.splice(0);
     for (const hook of hooks)
         await hook();
+    if (!_skipCleanupAfterEach)
+        (0, react_2.cleanup)();
 });
 const diff = (a, b) => (0, jest_diff_1.diff)(a, b, { omitAnnotationLines: true })
     ?.replace(/\w+ \{/g, "{") // Remove class names
@@ -230,14 +246,13 @@ const MockedProvider = ({ mocks, stack: renderStack, children, link: passedLink,
     if (_failRefetchWarnings) {
         const oldWarn = console.warn.bind(console.warn);
         console.warn = (message, operation, ...etc) => {
-            if (message !==
-                'Unknown query named "%s" requested in refetchQueries in options.include array') {
+            if (typeof message !== "string" ||
+                !message.match(/Unknown query named.*refetchQueries/))
                 return oldWarn(message, operation, ...etc);
-            }
             try {
                 fail({
                     name: "Error",
-                    message: `Expected query ${operation} requested in refetchQueries options.include array to have bene mocked`,
+                    message: `Expected query ${operation} requested in refetchQueries options.include array to have been mocked`,
                     stack: renderStack,
                 });
             }

package/types/jest.d.ts

@@ -1,10 +1,19 @@
 import React from "react";
 import { MockedProviderProps, MockedResponse } from "@apollo/client/testing";
+import "@testing-library/react/dont-cleanup-after-each";
 type ExtendedMockedResponse = MockedResponse & {
     stack?: string;
     watch?: boolean;
     optional?: boolean;
 };
+/**
+ * `@testing-library/react` automatically unmounts React trees that were mounted
+ * with render after each test, which `graphql-data-generator` hijacks to ensure
+ * cleanup is done after all mocks are consumed. Invoke this functions to
+ * disable automatic cleanup.
+ * @param value
+ */
+export declare const skipCleanupAfterEach: (value?: boolean) => void;
 /**
  * In older versions of `@apollo/client`, refetches with missing mocks trigger
  * warnings instead of being treated as standard missing mocks.