refined tests, and fixed scoping of repeat

src/lib/compile-route.js

@@ -186,7 +186,6 @@ const generateMatcher = (route, config) => {
 }
 
 const limitMatcher = (route) => {
-
 	if (!route.repeat) {
 		return;
 	}

src/lib/index.js

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

src/lib/inspecting.js

@@ -93,4 +93,4 @@ FetchMock.done = function (name) {
 		.filter(bool => !bool).length === 0
 };
 
-module.exports = FetchMock;
+module.exports = FetchMock;

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

@@ -24,6 +24,7 @@ FetchMock.mock = function (matcher, response, options = {}) {
 const getMatcher = (route, propName) => (route2) => route[propName] === route2[propName];
 
 FetchMock.addRoute = function (route) {
+	this._uncompiledRoutes.push(route);
 	route = this.compileRoute(route);
 
 	const clashes = this.routes.filter(getMatcher(route, 'name'));
@@ -91,6 +92,7 @@ FetchMock.restore = function () {
 	}
 	this.fallbackResponse = undefined;
 	this.routes = [];
+	this._uncompiledRoutes = [];
 	this.reset();
 	return this;
 }
@@ -103,4 +105,4 @@ FetchMock.reset = function () {
 	return this;
 }
 
-module.exports = FetchMock;
+module.exports = FetchMock;

test/specs/repeat.test.js

@@ -129,53 +129,62 @@ module.exports = (fetchMock) => {
 		});
 
 		describe('sandbox isolation', () => {
-			it('done-ness doesn\'t propagate to children of global', () => {
+			it('doesn\'t propagate to children of global', () => {
 				fm
-					.mock('http://it.at.there1/', 200, {repeat: 1});
+					.mock('http://it.at.there/', 200, {repeat: 1});
 
 				const sb1 = fm.sandbox();
 
-				fm.fetchHandler('http://it.at.there1/');
+				fm.fetchHandler('http://it.at.there/');
 
 				expect(fm.done()).to.be.true;
 				expect(sb1.done()).to.be.false;
+
+				expect(() => sb1.fetchHandler('http://it.at.there/')).not.to.throw();
 			});
 
-			it('done-ness doesn\'t propagate to global from children', () => {
+			it('doesn\'t propagate to global from children', () => {
 				fm
-					.mock('http://it.at.there1/', 200, {repeat: 1});
+					.mock('http://it.at.there/', 200, {repeat: 1});
 
 				const sb1 = fm.sandbox();
 
-				sb1.fetchHandler('http://it.at.there1/');
+				sb1.fetchHandler('http://it.at.there/');
 
 				expect(fm.done()).to.be.false;
 				expect(sb1.done()).to.be.true;
+
+				expect(() => fm.fetchHandler('http://it.at.there/')).not.to.throw();
 			});
 
-			it('done-ness doesn\'t propagate to children of sandbox', () => {
+			it('doesn\'t propagate to children of sandbox', () => {
 				const sb1 = fm
 					.sandbox()
-					.mock('http://it.at.there1/', 200, {repeat: 1});
+					.mock('http://it.at.there/', 200, {repeat: 1});
+
 				const sb2 = sb1.sandbox();
 
-				sb1.fetchHandler('http://it.at.there1/');
+				sb1.fetchHandler('http://it.at.there/');
 
 				expect(sb1.done()).to.be.true;
 				expect(sb2.done()).to.be.false;
+
+				expect(() => sb2.fetchHandler('http://it.at.there/')).not.to.throw();
 			});
 
-			it('done-ness doesn\'t propagate to sandbox from children', () => {
+			it('doesn\'t propagate to sandbox from children', () => {
 				const sb1 = fm
 					.sandbox()
-					.mock('http://it.at.there1/', 200, {repeat: 1});
+					.mock('http://it.at.there/', 200, {repeat: 1});
 
 				const sb2 = sb1.sandbox();
 
-				sb2.fetchHandler('http://it.at.there1/');
+				sb2.fetchHandler('http://it.at.there/');
 
 				expect(sb1.done()).to.be.false;
 				expect(sb2.done()).to.be.true;
+
+				expect(() => sb1.fetchHandler('http://it.at.there/')).not.to.throw();
 			});
 		});