employer
/
liza
1
0
Fork 0
Code Releases Activity

XhrHttpImpl: throw {=>Http}Error 

* src/dapi/http/XhrHttpImpl.js (serveError): Throw HttpError instead
  of Error.
* test/dapi/http/XhrHttpImplTest.js: Test updated accordingly.
master
Mike Gerwitz 2017-06-13 10:26:26 -04:00
parent a3e359a050
commit 624f35a489
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dapi/http/XhrHttpImpl.js
View File

@ -19,8 +19,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
var Class = require( 'easejs' ).Class, 'use strict';
HttpImpl = require( './HttpImpl' );
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 ) '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; e.status = req.status;
callback( e, req.responseText ); callback( e, req.responseText );

27
test/dapi/http/XhrHttpImplTest.js
View File

@ -19,19 +19,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
var dapi = require( '../../../' ).dapi, 'use strict';
expect = require( 'chai' ).expect,
Class = require( 'easejs' ).Class,
HttpImpl = dapi.http.HttpImpl,
Sut = dapi.http.XhrHttpImpl,
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() describe( 'XhrHttpImpl', function()
@ -260,7 +265,7 @@ describe( 'XhrHttpImpl', function()
Sut( StubXhr ) Sut( StubXhr )
.requestData( 'http://foo', 'GET', '', function( err, _ ) .requestData( 'http://foo', 'GET', '', function( err, _ )
{ {
expect( err ).to.be.instanceOf( Error ); expect( err ).to.be.instanceOf( HttpError );
expect( err.message ).to.contain( expect( err.message ).to.contain(
StubXhr.prototype.status StubXhr.prototype.status