Actually use Jest mocks

Sashko Stubailo · Sashko Stubailo · commit 18e4b7459940 · 2017-03-07T19:57:44.000-08:00
diff --git a/.eslintrc b/.eslintrc
@@ -12,6 +12,7 @@
     "import/prefer-default-export": 0,
     "import/no-extraneous-dependencies": 0,
     "import/imports-first": 0,
-    "no-use-before-define": 0
+    "no-use-before-define": 0,
+    "no-underscore-dangle": 0
   }
 }
diff --git a/__mocks__/request-promise.js b/__mocks__/request-promise.js
@@ -0,0 +1,55 @@
+let requestQueue = [];
+
+export default function rp(requestOptions) {
+  // Ensure we expected to get more requests
+  expect(requestQueue.length).not.toBe(0);
+
+  const nextRequest = requestQueue.shift();
+  // Ensure this is the request we expected
+  expect(requestOptions).toEqual(nextRequest.options);
+
+  return new Promise((resolve, reject) => {
+    if (nextRequest.result) {
+      resolve(nextRequest.result);
+    } else if (nextRequest.error) {
+      reject(nextRequest.error);
+    } else {
+      throw new Error('Mocked request must have result or error.');
+    }
+  });
+}
+
+function pushMockRequest({ options, result, error }) {
+  const defaultOptions = {
+    json: true,
+    headers: {
+      'user-agent': 'GitHunt',
+    },
+    resolveWithFullResponse: true,
+  };
+  const { uri, ...rest } = options;
+
+  const url = `https://api.github.com${uri}`;
+
+  requestQueue.push({
+    options: {
+      ...defaultOptions,
+      ...rest,
+      uri: url,
+    },
+    result,
+    error,
+  });
+}
+
+function flushRequestQueue() {
+  requestQueue = [];
+}
+
+function noRequestsLeft() {
+  expect(requestQueue.length).toBe(0);
+}
+
+rp.__pushMockRequest = pushMockRequest; // eslint-disable-line no-underscore-dangle
+rp.__flushRequestQueue = flushRequestQueue; // eslint-disable-line no-underscore-dangle
+rp.__noRequestsLeft = noRequestsLeft; // eslint-disable-line no-underscore-dangle
diff --git a/api/github/connector.test.js b/api/github/connector.test.js
@@ -1,58 +1,14 @@
-import { GitHubConnector } from './connector';
-
-let requestQueue = [];
-
-function mockRequestPromise(requestOptions) {
-  // Ensure we expected to get more requests
-  expect(requestQueue.length).not.toBe(0);
-
-  const nextRequest = requestQueue.shift();
-  // Ensure this is the request we expected
-  expect(requestOptions).toEqual(nextRequest.options);
+import rp from 'request-promise';
 
-  return new Promise((resolve, reject) => {
-    if (nextRequest.result) {
-      resolve(nextRequest.result);
-    } else if (nextRequest.error) {
-      reject(nextRequest.error);
-    } else {
-      throw new Error('Mocked request must have result or error.');
-    }
-  });
-}
-
-function pushMockRequest({ options, result, error }) {
-  const defaultOptions = {
-    json: true,
-    headers: {
-      'user-agent': 'GitHunt',
-    },
-    resolveWithFullResponse: true,
-  };
-  const { uri, ...rest } = options;
-
-  const url = `https://api.github.com${uri}`;
-
-  requestQueue.push({
-    options: {
-      ...defaultOptions,
-      ...rest,
-      uri: url,
-    },
-    result,
-    error,
-  });
-}
-
-GitHubConnector.mockRequestPromise = mockRequestPromise;
+import { GitHubConnector } from './connector';
 
 describe('GitHub connector', () => {
   beforeEach(() => {
-    requestQueue = [];
+    rp.__flushRequestQueue();
   });
 
   afterEach(() => {
-    expect(requestQueue.length).toBe(0);
+    rp.__noRequestsLeft();
   });
 
   it('can be constructed', () => {
@@ -62,7 +18,7 @@ describe('GitHub connector', () => {
   it('can load one endpoint', () => {
     const connector = new GitHubConnector();
 
-    pushMockRequest({
+    rp.__pushMockRequest({
       options: { uri: '/endpoint' },
       result: {
         headers: {},
@@ -78,7 +34,7 @@ describe('GitHub connector', () => {
   it('fetches each endpoint only once per instance', () => {
     const connector = new GitHubConnector();
 
-    pushMockRequest({
+    rp.__pushMockRequest({
       options: {
         uri: '/endpoint',
       },
@@ -108,7 +64,7 @@ describe('GitHub connector', () => {
       clientSecret: 'fake_client_secret',
     });
 
-    pushMockRequest({
+    rp.__pushMockRequest({
       options: {
         uri: '/endpoint',
         qs: {
@@ -133,7 +89,7 @@ describe('GitHub connector', () => {
     const connector = new GitHubConnector();
     const etag = 'etag';
 
-    pushMockRequest({
+    rp.__pushMockRequest({
       options: {
         uri: '/endpoint',
       },
@@ -149,7 +105,7 @@ describe('GitHub connector', () => {
 
     const connector2 = new GitHubConnector();
 
-    pushMockRequest({
+    rp.__pushMockRequest({
       options: {
         uri: '/endpoint',
         headers: {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"import/prefer-default-export": 0,`
`13`	`13`	`"import/no-extraneous-dependencies": 0,`
`14`	`14`	`"import/imports-first": 0,`
`15`		`- "no-use-before-define": 0`
	`15`	`+ "no-use-before-define": 0,`
	`16`	`+ "no-underscore-dangle": 0`
`16`	`17`	`}`
`17`	`18`	`}`