diff --git a/src/dapi/http/XhrHttpImpl.js b/src/dapi/http/XhrHttpImpl.js index c4a0820..20e0f19 100644 --- a/src/dapi/http/XhrHttpImpl.js +++ b/src/dapi/http/XhrHttpImpl.js @@ -19,8 +19,11 @@ * along with this program. If not, see . */ -var Class = require( 'easejs' ).Class, - HttpImpl = require( './HttpImpl' ); +'use strict'; + +const Class = require( 'easejs' ).Class; +const HttpImpl = require( './HttpImpl' ); +const HttpError = require( './HttpError' ); /** @@ -272,7 +275,7 @@ module.exports = Class( 'XhrHttpImpl' ) */ 'virtual protected serveError': function( req, callback ) { - var e = Error( req.status + " error from server" ); + var e = HttpError( req.status + " error from server" ); e.status = req.status; callback( e, req.responseText ); diff --git a/test/dapi/http/XhrHttpImplTest.js b/test/dapi/http/XhrHttpImplTest.js index 17e6eac..588f416 100644 --- a/test/dapi/http/XhrHttpImplTest.js +++ b/test/dapi/http/XhrHttpImplTest.js @@ -19,19 +19,24 @@ * along with this program. If not, see . */ -var dapi = require( '../../../' ).dapi, - expect = require( 'chai' ).expect, - Class = require( 'easejs' ).Class, - HttpImpl = dapi.http.HttpImpl, - Sut = dapi.http.XhrHttpImpl, +'use strict'; - DummyXhr = function() +const { expect } = require( 'chai' ); +const { Class } = require( 'easejs' ); + +const { + HttpImpl, + XhrHttpImpl: Sut, + HttpError, +} = require( '../../../' ).dapi.http; + +const DummyXhr = function() +{ + this.open = function() { - this.open = function() - { - DummyXhr.args = arguments; - }; + DummyXhr.args = arguments; }; +}; describe( 'XhrHttpImpl', function() @@ -260,7 +265,7 @@ describe( 'XhrHttpImpl', function() Sut( StubXhr ) .requestData( 'http://foo', 'GET', '', function( err, _ ) { - expect( err ).to.be.instanceOf( Error ); + expect( err ).to.be.instanceOf( HttpError ); expect( err.message ).to.contain( StubXhr.prototype.status