add jest-plugin-set and rework tests to utilize set

- this offers better flow for writing tests and nested describes changing the test setup.

Author: urkle

package.json

@@ -20,7 +20,9 @@
     "url": "git+https://github.com/f/graphql-client.git"
   },
   "devDependencies": {
+    "babel-runtime": "^6.26.0",
     "jest": "^27.4.5",
+    "jest-plugin-set": "^2.9.0",
     "jest-mock-random": "^1.1.1",
     "uglify-js": "^3.14.5"
   },
@@ -36,5 +38,10 @@
   "bugs": {
     "url": "https://github.com/f/graphql-client/issues"
   },
-  "homepage": "https://github.com/f/graphql-client#readme"
+  "homepage": "https://github.com/f/graphql-client#readme",
+  "jest": {
+    "setupFiles": [
+      "jest-plugin-set/setup"
+    ]
+  }
 }

test/test.js

@@ -1,4 +1,4 @@
-// to fake out graphql to use XHR so we can stub it
+// to fake out graphql to use XHR, so we can stub it
 global.XMLHttpRequest = null;
 
 let {mockRandom} = require('jest-mock-random');
@@ -27,33 +27,33 @@ function mockXHR(status, data) {
     return xhrMockObj;
 }
 
+/* global client, method, url, fetchPost, fetchComments */
 describe('graphql.js', () => {
-    let client = null;
-
-    beforeEach(() => {
-        client = graphql(null, {
-            method: 'put',
+    set('url', () => null);
+    set('method', () => 'put');
+    set('client', () =>
+        graphql(url, {
+            method: method,
             asJSON: true,
             fragments: {
                 user: 'on User {name}',
                 auth: {
                     user: 'on User {token, ...user}'
                 }
             }
-        });
-        client.fragment({
-            auth: {
-                error: 'on Error {messages}'
-            }
-        });
-    });
+        }));
 
     it('client should be a function', () => {
         expect(typeof client).toBe('function');
     });
 
     describe('.fragment()', () => {
         it('registers a new fragment', () => {
+            client.fragment({
+                auth: {
+                    error: 'on Error {messages}'
+                }
+            });
 
             expect(client.fragment('auth.error')).toBe(
                 'fragment auth_error on Error {messages}'
@@ -77,7 +77,13 @@ describe('graphql.js', () => {
             );
         });
 
-        it('returns returns new fragments registered as well', () => {
+        it('returns new registered fragments as well', () => {
+            client.fragment({
+                auth: {
+                    error: 'on Error {messages}'
+                }
+            });
+
             expect(client.fragments()).toStrictEqual(
                 expect.objectContaining({
                     auth_error: '\nfragment auth_error on Error {messages}',
@@ -98,6 +104,12 @@ describe('graphql.js', () => {
 }`;
 
         it('mixes in the requested fragments and sets the data types', () => {
+            client.fragment({
+                auth: {
+                    error: 'on Error {messages}'
+                }
+            });
+
             var expectedQuery = `query ($name: String!, $bool: Boolean!, $int: Int!, $float: Float!, $id: ID!, $user_id: Int!, $postID: ID!, $custom_id: CustomType!, $customId: ID!, $target: [ID!]!) {
 	user(name: $name, bool: $bool, int: $int, id: $id) {
 		... auth_user
@@ -170,28 +182,23 @@ fragment auth_error on Error {messages}`;
     });
 
     describe('query testing', () => {
-        let fetchPost = null;
-        let fetchComments = null;
-
-        beforeEach(() => {
-            client.setUrl('https://example.org');
-            fetchPost = client.query(`{
+        set('fetchPost', () => client.query(`{
   post(id: $id) {
     id
     title
     text
   }
-}`);
-
-            fetchComments = client.query(`{
+}`));
+        set('fetchComments', () => client.query(`{
   commentsOfPost: comments(postId: $postId) {
     comment
     owner {
       name
     }
   }
-}`);
-        });
+}`));
+
+        set('url', () => 'https://example.org');
 
         describe('when executing the queries normally', () => {
             it('sends a network request right away', () => {

yarn.lock

@@ -767,6 +767,14 @@ babel-preset-jest@^27.5.1:
     babel-plugin-jest-hoist "^27.5.1"
     babel-preset-current-node-syntax "^1.0.0"
 
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -928,6 +936,11 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   dependencies:
     safe-buffer "~5.1.1"
 
+core-js@^2.4.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
 cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -1606,6 +1619,11 @@ jest-mock@^27.5.1:
     "@jest/types" "^27.5.1"
     "@types/node" "*"
 
+jest-plugin-set@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/jest-plugin-set/-/jest-plugin-set-2.9.0.tgz#95d4cb0e25e117b8a0b19846598887bf4bb95fca"
+  integrity sha512-7woJ1+EvpjQJ0CdWert87b5/HjvNZruoV8qDeApJtf4ZPGMflCqPeOOX38pA8CBo34QyoLpkaV2hVM0wVLMS4Q==
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
@@ -2117,6 +2135,11 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"