Merge remote-tracking branch 'lsimone/master'

# Conflicts:
#	README.md
#	src/index.d.ts
#	src/index.js

Author: lsimone

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["env"]
+}

.gitignore

@@ -1,2 +1,4 @@
 node_modules
 npm-debug.log
+yarn-error.log
+coverage

.npmignore

@@ -0,0 +1,2 @@
+tests
+yarn.lock

README.md

@@ -2,22 +2,22 @@
 
 Fetch is the new way to do HTTP requests in the browser, and it can be used in other environments such as React Native. Jest Fetch Mock allows you to easily mock your `fetch` calls and return the response you need to fake the HTTP requests. It's easy to setup and you don't need a library like `nock` to get going and it uses Jest's built-in support for mocking under the surface. This means that any of the `jest.fn()` methods are also available. For more information on the jest mock API, check their docs [here](https://facebook.github.io/jest/docs/en/mock-functions.html)
 
-It currently supports the mocking of the go-to isomorphic polyfill for fetch, [`isomorphic-fetch`](https://github.com/matthew-andrews/isomorphic-fetch), so it supports Node.js and any browser-like runtime.
+It currently supports the mocking with the [`cross-fetch`](https://www.npmjs.com/package/cross-fetch) polyfill, so it supports Node.js and any browser-like runtime.
 
 ## Contents
 
-* [Usage](#usage)
-  * [Installation and Setup](#installation-and-setup)
-  * [Using with Create-React-App](#using-with-create-react-app)
-* [API](#api)
-* [Examples](#examples)
-  * [Simple mock and assert](#simple-mock-and-assert)
-  * [Mocking all fetches](#mocking-all-fetches)
-  * [Mocking a failed fetch](#mocking-a-failed-fetch)
-  * [Mocking multiple fetches with different responses](#mocking-multiple-fetches-with-different-responses)
-  * [Mocking multiple fetches with `fetch.mockResponses`](#mocking-multiple-fetches-with-fetchmockresponses)
-  * [Reset mocks between tests with `fetch.resetMocks`](#reset-mocks-between-tests-with-fetchresetmocks)
-  * [Using `fetch.mock` to inspect the mock state of each fetch call](#using-fetchmock-to-inspect-the-mock-state-of-each-fetch-call)
+- [Usage](#usage)
+  - [Installation and Setup](#installation-and-setup)
+  - [Using with Create-React-App](#using-with-create-react-app)
+- [API](#api)
+- [Examples](#examples)
+  - [Simple mock and assert](#simple-mock-and-assert)
+  - [Mocking all fetches](#mocking-all-fetches)
+  - [Mocking a failed fetch](#mocking-a-failed-fetch)
+  - [Mocking multiple fetches with different responses](#mocking-multiple-fetches-with-different-responses)
+  - [Mocking multiple fetches with `fetch.mockResponses`](#mocking-multiple-fetches-with-fetchmockresponses)
+  - [Reset mocks between tests with `fetch.resetMocks`](#reset-mocks-between-tests-with-fetchresetmocks)
+  - [Using `fetch.mock` to inspect the mock state of each fetch call](#using-fetchmock-to-inspect-the-mock-state-of-each-fetch-call)
 
 ## Usage
 
@@ -51,6 +51,8 @@ Add the setupFile to your jest config in `package.json`:
 
 If you are using [Create-React-App](https://github.com/facebookincubator/create-react-app) (CRA), the code for `setupTest.js` above should be placed into `src/setupTests.js` in the root of your project. CRA automatically uses this filename by convention in the Jest configuration it generates. Similarly, changing to your `package.json` is not required as CRA handles this when generating your Jest configuration.
 
+### For Ejected Create React Apps _ONLY_:
+
 > Note: Keep in mind that if you decide to "eject" before creating src/setupTests.js, the resulting package.json file won't contain any reference to it, so you should manually create the property setupTestFrameworkScriptFile in the configuration for Jest, something like the [following](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#srcsetuptestsjs-1):
 
 ```JSON
@@ -63,13 +65,13 @@ If you are using [Create-React-App](https://github.com/facebookincubator/create-
 
 ### Mock Responses
 
-* `fetch.mockResponse(bodyOrFunction, init): fetch` - Mock all fetch calls
-* `fetch.mockResponseOnce(bodyOrFunction, init): fetch` - Mock each fetch call independently
-* `fetch.once(bodyOrFunction, init): fetch` - Alias for mockResponseOnce
-* `fetch.mockResponses(...responses): fetch` - Mock multiple fetch calls independently
-  * Each argument is an array taking `[bodyOrFunction, init]`
-* `fetch.mockReject(errorOrFunction): fetch` - Mock all fetch calls, letting them fail directly
-* `fetch.mockRejectOnce(errorOrFunction): fetch` - Let the next fetch call fail directly
+- `fetch.mockResponse(bodyOrFunction, init): fetch` - Mock all fetch calls
+- `fetch.mockResponseOnce(bodyOrFunction, init): fetch` - Mock each fetch call independently
+- `fetch.once(bodyOrFunction, init): fetch` - Alias for mockResponseOnce
+- `fetch.mockResponses(...responses): fetch` - Mock multiple fetch calls independently
+  - Each argument is an array taking `[bodyOrFunction, init]`
+- `fetch.mockReject(errorOrFunction): fetch` - Mock all fetch calls, letting them fail directly
+- `fetch.mockRejectOnce(errorOrFunction): fetch` - Let the next fetch call fail directly
 
 ### Functions
 
@@ -92,11 +94,10 @@ fetch.mockReject(new Promise((resolve, reject) => {
 }))
 ```
 
-
 ### Mock utilities
 
-* `fetch.resetMocks()` - Clear previously set mocks so they do not bleed into other mocks
-* `fetch.mock` - The mock state for your fetch calls. Make assertions on the arguments given to `fetch` when called by the functions you are testing. For more information check the [Jest docs](https://facebook.github.io/jest/docs/en/mock-functions.html#mock-property)
+- `fetch.resetMocks()` - Clear previously set mocks so they do not bleed into other mocks
+- `fetch.mock` - The mock state for your fetch calls. Make assertions on the arguments given to `fetch` when called by the functions you are testing. For more information check the [Jest docs](https://facebook.github.io/jest/docs/en/mock-functions.html#mock-property)
 
 For information on the arguments body and init can take, you can look at the MDN docs on the Response Constructor function, which `jest-fetch-mock` uses under the surface.
 
@@ -438,7 +439,7 @@ describe('getYear action creator', () => {
 ```js
 // api.js
 
-import 'isomorphic-fetch'
+import 'cross-fetch'
 
 export function APIRequest(who) {
   if (who === 'facebook') {

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "jest-fetch-mock",
-  "version": "1.6.4",
+  "version": "1.7.5",
   "description": "fetch mock for jest",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -23,13 +23,25 @@
   },
   "homepage": "https://github.com/jefflau/jest-fetch-mock#readme",
   "dependencies": {
-    "@types/jest": "^23.0.0",
-    "isomorphic-fetch": "^2.2.1",
+    "cross-fetch": "^2.2.2",
     "promise-polyfill": "^7.1.1"
   },
+  "devDependencies": {
+    "babel-core": "^6.26.3",
+    "babel-jest": "^23.4.2",
+    "babel-preset-env": "^1.7.0",
+    "jest": "^23.5.0",
+    "regenerator-runtime": "^0.12.1"
+  },
   "prettier": {
     "semi": false,
     "editor.formatOnSave": true,
     "singleQuote": true
+  },
+  "jest": {
+    "automock": false,
+    "setupFiles": [
+      "./setupJest.js"
+    ]
   }
 }

package.json

@@ -0,0 +1 @@
+global.fetch = require('jest-fetch-mock')

setupJest.js

@@ -12,6 +12,7 @@ declare module "jest-fetch-mock" {
     (input?: string | Request, init?: RequestInit): Promise<Response>;
     mockResponse(body: string | Function, init?: MockParams): Fetch;
     mockResponseOnce(body: string | Function, init?: MockParams): Fetch;
+    once(body: string, init?: MockParams): Fetch;
     mockResponses(...responses : Array<[string] | [string, MockParams]>): Fetch;
     mockReject(error?: Error | Function): Fetch;
     mockRejectOnce(error?: Error | Function): Fetch;

src/index.d.ts

@@ -1,4 +1,8 @@
-require('isomorphic-fetch')
+const crossFetch = require('cross-fetch')
+global.fetch = crossFetch
+global.Response = crossFetch.Response
+global.Headers = crossFetch.Headers
+global.Request = crossFetch.Request
 
 if (!Promise) {
   Promise = require('promise-polyfill')
@@ -8,8 +12,12 @@ if (!Promise) {
 
 const ActualResponse = Response
 
-function ResponseWrapper (body, init) {
-  if (body && typeof body.constructor === 'function' && body.constructor.__isFallback) {
+function ResponseWrapper(body, init) {
+  if (
+    body &&
+    typeof body.constructor === 'function' &&
+    body.constructor.__isFallback
+  ) {
     const response = new ActualResponse(null, init)
     response.body = body
 

src/index.js

@@ -0,0 +1,48 @@
+import 'cross-fetch/polyfill'
+
+export async function APIRequest(who) {
+  if (who === 'facebook') {
+    const call1 = fetch('https://facebook.com/someOtherResource').then(res =>
+      res.json()
+    )
+    const call2 = fetch('https://facebook.com').then(res => res.json())
+    return Promise.all([call1, call2])
+  } else if (who === 'twitter') {
+    return fetch('https://twitter.com').then(res => res.json())
+  } else {
+    return fetch('https://google.com').then(res => res.json())
+  }
+}
+
+export function APIRequest2(who) {
+  if (who === 'google') {
+    return fetch('https://google.com').then(res => res.json())
+  } else {
+    return 'no argument provided'
+  }
+}
+
+export function request() {
+  return fetch('https://randomuser.me/api', {})
+    .then(response => {
+      const contentType = response.headers.get('content-type')
+
+      if (/application\/json/.test(contentType)) {
+        return response.json()
+      }
+
+      if (/text\/csv/.test(contentType)) {
+        return response.blob()
+      }
+
+      if (!contentType || /^text\/|charset=utf-8$/.test(contentType)) {
+        return response.text()
+      }
+
+      return response
+    })
+    .catch(error => {
+      const errorData = JSON.parse(error)
+      throw new Error(errorData.error)
+    })
+}