Merge branch 'master' of https://github.com/wheresrhys/fetch-mock int…

…o v8

* 'master' of https://github.com/wheresrhys/fetch-mock:
  document new behaviour
  implement behaviour
  added tests for calling mock() with no params
  clarify docs on overwriteRoutes

docs/_api-mocking/mock.md

@@ -2,7 +2,10 @@
 title: ".mock(matcher, response, options)"
 navTitle: .mock()
 position: 1.0
-description: Initialises or extends a stub implementation of fetch, applying a `route` that matches `matcher`, delivers a `Response` configured using `response`, and that respects the additional `options`. The stub will record its calls so they can be inspected later. If `.mock()` is called on the top level `fetch-mock` instance, this stub function will also replace `fetch` globally. 
+description: |
+  Initialises or extends a stub implementation of fetch, applying a `route` that matches `matcher`, delivers a `Response` configured using `response`, and that respects the additional `options`. The stub will record its calls so they can be inspected later. If `.mock` is called on the top level `fetch-mock` instance, this stub function will also replace `fetch` globally. Calling `.mock()` with no arguments will carry out this stubbing without defining any mock responses.
+
+  *In the documentation **route** is often used to refer to the combination of matching and responding behaviour set up using a single call to `mock()`*
 parameters:
   - name: matcher
     types:
@@ -23,9 +26,7 @@ parameters:
       - Object
     content: More options to configure matching and responding behaviour
 content_markdown: |-
-  Alternatively a single parameter, `options`, an Object with `matcher`, `response` and other options defined, can be passed
-
-  In the documentation "route" is often used to refer to the combination of matching and responding behaviour set up using a single call to `mock()`
+  Alternatively a single parameter, `options`, an Object with `matcher`, `response` and other options defined, can be passed in
   
 
 left_code_blocks:

docs/_api-mocking/mock_options.md

@@ -2,7 +2,9 @@
 title: 'options'
 position: 1.3
 description: |-
-  An object containing further options for configuring mocking behaviour
+  An object containing further options for configuring mocking behaviour.
+
+  **IMPORTANT NOTE:** *To set multiple mocks which use the same `matcher` but use some of the options below to match on different criteria e.g. different headers, you will also need to set `overwriteRoutes: false` in this options object*
 types:
   - Object
 type: parameter

src/lib/set-up-and-tear-down.js

@@ -1,26 +1,29 @@
 const compileRoute = require('./compile-route');
 const FetchMock = {};
 
-FetchMock.mock = function(matcher, response, options = {}) {
-	let route;
-
-	// Handle the variety of parameters accepted by mock (see README)
-	if (matcher && response) {
-		route = Object.assign(
-			{
-				matcher,
-				response
-			},
-			options
-		);
-	} else if (matcher && matcher.matcher) {
-		route = matcher;
-	} else {
-		throw new Error('fetch-mock: Invalid parameters passed to fetch-mock');
+FetchMock.mock = function(...args) {
+	if (args.length) {
+		const [matcher, response, options = {}] = args;
+		let route;
+
+		// Handle the variety of parameters accepted by mock (see README)
+		if (matcher && response) {
+			route = Object.assign(
+				{
+					matcher,
+					response
+				},
+				options
+			);
+		} else if (matcher && matcher.matcher) {
+			route = matcher;
+		} else {
+			throw new Error('fetch-mock: Invalid parameters passed to fetch-mock');
+		}
+
+		this.addRoute(route);
 	}
 
-	this.addRoute(route);
-
 	return this._mock();
 };
 

test/specs/set-up-and-tear-down.test.js

@@ -45,10 +45,12 @@ module.exports = fetchMock => {
 			describe('parameters', () => {
 				beforeEach(() => {
 					sinon.stub(fm, 'compileRoute').returns({});
+					sinon.stub(fm, '_mock').returns(fm);
 				});
 
 				afterEach(() => {
 					fm.compileRoute.restore();
+					fm._mock.restore();
 				});
 
 				it('accepts single config object', () => {
@@ -58,6 +60,7 @@ module.exports = fetchMock => {
 					};
 					expect(() => fm.mock(config)).not.to.throw();
 					expect(fm.compileRoute).calledWith(config);
+					expect(fm._mock).called;
 				});
 
 				it('accepts matcher, route pairs', () => {
@@ -66,6 +69,7 @@ module.exports = fetchMock => {
 						matcher: 'http://it.at.there/',
 						response: 200
 					});
+					expect(fm._mock).called;
 				});
 
 				it('accepts matcher, response, config triples', () => {
@@ -81,6 +85,7 @@ module.exports = fetchMock => {
 						method: 'PUT',
 						some: 'prop'
 					});
+					expect(fm._mock).called;
 				});
 
 				it('expects a matcher', () => {
@@ -91,6 +96,12 @@ module.exports = fetchMock => {
 					expect(() => fm.mock('http://it.at.there/')).to.throw();
 				});
 
+				it('can be called with no parameters', () => {
+					expect(() => fm.mock()).not.to.throw();
+					expect(fm.compileRoute).not.called;
+					expect(fm._mock).called;
+				});
+
 				it('REGRESSION: should accept object respones when passing options', () => {
 					expect(() =>
 						fm.mock('http://foo.com', { foo: 'bar' }, { method: 'GET' })