Abort error (#440)

Abort error

package.json

@@ -57,6 +57,7 @@
     "node": ">=4.0.0"
   },
   "devDependencies": {
+    "abort-controller": "^3.0.0",
     "babel-cli": "^6.1.2",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-runtime": "^6.23.0",

src/lib/fetch-handler.js

@@ -2,6 +2,19 @@ const responseBuilder = require('./response-builder');
 const requestUtils = require('./request-utils');
 const FetchMock = {};
 
+// see https://heycam.github.io/webidl/#aborterror for the standardised interface
+// Note that this differs slightly from node-fetch
+class AbortError extends Error {
+	constructor() {
+		super(...arguments);
+		this.name = 'AbortError';
+		this.message = 'The operation was aborted.';
+
+		// Do not include this class in the stacktrace
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
 const resolve = async (
 	{ response, responseIsFetch = false },
 	url,
@@ -49,7 +62,7 @@ FetchMock.fetchHandler = function(url, options, request) {
 	return new this.config.Promise((res, rej) => {
 		if (options && options.signal) {
 			const abort = () => {
-				rej(new Error(`URL '${url}' aborted.`));
+				rej(new AbortError());
 				done();
 			};
 			if (options.signal.aborted) {

test/client.js

@@ -26,7 +26,7 @@ describe('request types that only work in the browser', function() {
 	});
 });
 
-require('./runner')(fetchMock, window, window.fetch);
+require('./runner')(fetchMock, window, window.fetch, window.AbortController);
 
 describe('no real fetch', function() {
 	it('should cope when there is no global fetch defined', function() {

test/runner.js

@@ -1,7 +1,7 @@
 const chai = require('chai');
 const expect = chai.expect;
 
-module.exports = (fetchMock, theGlobal, fetch) => {
+module.exports = (fetchMock, theGlobal, fetch, AbortController) => {
 	describe('fetch-mock', () => {
 		it('exports itself as a property', () => {
 			expect(fetchMock.fetchMock).to.equal(fetchMock);
@@ -16,6 +16,6 @@ module.exports = (fetchMock, theGlobal, fetch) => {
 		require('./specs/repeat.test')(fetchMock);
 		require('./specs/custom-implementations.test')(fetchMock);
 		require('./specs/options.test')(fetchMock, theGlobal, fetch);
-		require('./specs/abortable.test')(fetchMock, fetch);
+		require('./specs/abortable.test')(fetchMock, AbortController);
 	});
 };

test/server.js

@@ -18,7 +18,12 @@ describe('nodejs tests', () => {
 		server.close();
 	});
 
-	require('./runner')(fetchMock, global, require('node-fetch'));
+	require('./runner')(
+		fetchMock,
+		global,
+		require('node-fetch'),
+		require('abort-controller')
+	);
 
 	describe('support for nodejs body types', () => {
 		afterEach(() => fetchMock.reset());

test/specs/abortable.test.js

@@ -1,12 +1,8 @@
 const chai = require('chai');
 const expect = chai.expect;
 
-module.exports = fetchMock => {
-	if (typeof AbortController === 'undefined') {
-		return;
-	}
-
-	describe('abortable fetch', () => {
+module.exports = (fetchMock, AbortController) => {
+	(AbortController ? describe : describe.skip)('abortable fetch', () => {
 		let fm;
 		beforeEach(() => {
 			fm = fetchMock.createInstance();
@@ -29,7 +25,8 @@ module.exports = fetchMock => {
 					signal: controller.signal
 				});
 			} catch (error) {
-				expect(error.message).to.equal("URL 'http://it.at.there/' aborted.");
+				expect(error.name).to.equal('AbortError');
+				expect(error.message).to.equal('The operation was aborted.');
 			}
 		});
 
@@ -44,7 +41,8 @@ module.exports = fetchMock => {
 					signal: controller.signal
 				});
 			} catch (error) {
-				expect(error.message).to.equal("URL 'http://it.at.there/' aborted.");
+				expect(error.name).to.equal('AbortError');
+				expect(error.message).to.equal('The operation was aborted.');
 			}
 		});