avoid passing arrays around

src/Route/index.js

@@ -10,10 +10,10 @@ const isUrlMatcher = (matcher) =>
 const isFunctionMatcher = (matcher) => typeof matcher === 'function';
 
 class Route {
-	constructor(args) {
+	constructor(...args) {
 		const debug = getDebug('compileRoute()');
 		debug('Compiling route');
-		this.init(args);
+		this.init(...args);
 		this.sanitize();
 		this.validate();
 		this.generateMatcher();
@@ -33,9 +33,7 @@ class Route {
 		}
 	}
 
-	init(args) {
-		const [matcher, response, options = {}] = args;
-
+	init(matcher, response, options = {}) {
 		const routeConfig = {};
 
 		if (isUrlMatcher(matcher) || isFunctionMatcher(matcher)) {
@@ -143,8 +141,8 @@ class Route {
 		Route.registeredMatchers.push(matcher);
 	}
 
-	static newRoute(config) {
-		return new Route(config);
+	static newRoute(...config) {
+		return new Route(...config);
 	}
 }
 

src/lib/index.js

@@ -18,7 +18,7 @@ FetchMock.createInstance = function () {
 	const instance = Object.create(FetchMock);
 	instance._uncompiledRoutes = (this._uncompiledRoutes || []).slice();
 	instance.routes = instance._uncompiledRoutes.map((config) =>
-		Route.newRoute(config)
+		Route.newRoute(...config)
 	);
 	instance.fallbackResponse = this.fallbackResponse || undefined;
 	instance.config = Object.assign({}, this.config || FetchMock.config);

src/lib/inspecting.js

@@ -6,9 +6,9 @@ const isName = (nameOrMatcher) =>
 	typeof nameOrMatcher === 'string' && /^[\da-zA-Z\-]+$/.test(nameOrMatcher);
 
 const filterCallsWithMatcher = function (matcher, options = {}, calls) {
-	({ matcher } = Route.newRoute([
-		Object.assign({ matcher, response: 'ok' }, options),
-	]));
+	({ matcher } = Route.newRoute(
+		Object.assign({ matcher, response: 'ok' }, options)
+	));
 	return calls.filter(({ url, options }) =>
 		matcher(normalizeUrl(url), options, null, this)
 	);

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

@@ -22,7 +22,7 @@ FetchMock.mock = function (...args) {
 
 FetchMock.addRoute = function (uncompiledRoute) {
 	debug('Adding route', uncompiledRoute);
-	const route = Route.newRoute(uncompiledRoute);
+	const route = Route.newRoute(...uncompiledRoute);
 	const clashes = this.routes.filter(({ identifier, method }) => {
 		const isMatch =
 			typeof identifier === 'function'

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

@@ -58,13 +58,13 @@ describe('Set up and tear down', () => {
 					response: 200,
 				};
 				expect(() => fm.mock(config)).not.to.throw();
-				expect(Route.newRoute).calledWith([config]);
+				expect(Route.newRoute).calledWith(config);
 				expect(fm._mock).called;
 			});
 
 			it('accepts matcher, route pairs', () => {
 				expect(() => fm.mock('*', 200)).not.to.throw();
-				expect(Route.newRoute).calledWith(['*', 200]);
+				expect(Route.newRoute).calledWith('*', 200);
 				expect(fm._mock).called;
 			});
 
@@ -75,14 +75,10 @@ describe('Set up and tear down', () => {
 						some: 'prop',
 					})
 				).not.to.throw();
-				expect(Route.newRoute).calledWith([
-					'*',
-					'ok',
-					{
-						method: 'PUT',
-						some: 'prop',
-					},
-				]);
+				expect(Route.newRoute).calledWith('*', 'ok', {
+					method: 'PUT',
+					some: 'prop',
+				});
 				expect(fm._mock).called;
 			});
 

test/specs/shorthands.test.js

@@ -28,7 +28,7 @@ describe('shorthands', () => {
 		fm = fetchMock.createInstance();
 		sinon.spy(Route, 'newRoute');
 		fm.config.warnOnUnmatched = false;
-		expectRoute = (...args) => expect(Route.newRoute).calledWith(args);
+		expectRoute = (...args) => expect(Route.newRoute).calledWith(...args);
 	});
 	afterEach(() => {
 		Route.newRoute.resetHistory();