vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: XHR errors have response/code fields

Browse source 
So that there's no chance of data loss and it's trivial to get the response code (because it's hella useful)

Fixes #1866
Fixes #1876
This commit is contained in:
Pat Cavit 2017-07-18 22:53:17 -07:00
parent 1a1ae8e843
commit 5aac004709
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
request/request.js
View file

@ -93,7 +93,8 @@ module.exports = function($window, Promise) {
} }
else { else {
var error = new Error(xhr.responseText) var error = new Error(xhr.responseText)
for (var key in response) error[key] = response[key] error.code = xhr.status
error.response = response
reject(error) reject(error)
} }
} }

7
request/tests/test-request.js
View file

@ -458,9 +458,10 @@ o.spec("xhr", function() {
xhr({method: "GET", url: "/item"}).catch(function(e) { xhr({method: "GET", url: "/item"}).catch(function(e) {
o(e instanceof Error).equals(true) o(e instanceof Error).equals(true)
o(e.message).equals(JSON.stringify({error: "error"})) o(e.message).equals(JSON.stringify({error: "error"}))
o(e.code).equals(500)
}).then(done) }).then(done)
}) })
o("extends Error with JSON response", function(done) { o("adds response to Error", function(done) {
mock.$defineRoutes({ mock.$defineRoutes({
"GET /item": function() { "GET /item": function() {
return {status: 500, responseText: JSON.stringify({message: "error", stack: "error on line 1"})} return {status: 500, responseText: JSON.stringify({message: "error", stack: "error on line 1"})}
@ -468,8 +469,8 @@ o.spec("xhr", function() {
}) })
xhr({method: "GET", url: "/item"}).catch(function(e) { xhr({method: "GET", url: "/item"}).catch(function(e) {
o(e instanceof Error).equals(true) o(e instanceof Error).equals(true)
o(e.message).equals("error") o(e.response.message).equals("error")
o(e.stack).equals("error on line 1") o(e.response.stack).equals("error on line 1")
}).then(done) }).then(done)
}) })
o("rejects on non-JSON server error", function(done) { o("rejects on non-JSON server error", function(done) {