Skip to content

Commit

Permalink
check for errors before trying to parse response
Browse files Browse the repository at this point in the history
resolves #110
  • Loading branch information
tomwayson committed Feb 28, 2018
1 parent 2a30d22 commit 14f5668
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
5 changes: 5 additions & 0 deletions packages/arcgis-rest-request/src/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ export function request(
return options.fetch(url, fetchOptions);
})
.then(response => {
if (!response.ok) {
// server responded w/ an actual error (404, 500, etc)
const { status, statusText } = response;
return Promise.reject(new Error(`${status}: ${statusText}`));
}
switch (params.f) {
case "json":
return response.json();
Expand Down
14 changes: 14 additions & 0 deletions packages/arcgis-rest-request/test/request.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,18 @@ describe("request()", () => {
});
});

it("should re-throw HTTP errors (404, 500, etc)", done => {
fetchMock.once("*", 404);

request(
"https://www.arcgis.com/sharing/rest/content/items/43a8e51789044d9480a20089a84129ad/data"
).catch(error => {
expect(error.message).toBe("404: Not Found");
expect(error instanceof Error).toBeTruthy();
done();
});
});

it("should throw errors with information about the request", done => {
fetchMock.once("*", ArcGISOnlineError);

Expand All @@ -189,6 +201,7 @@ describe("request()", () => {

it("should allow you to use custom implementations of `fetch`", done => {
const MockFetchResponse = {
ok: true,
json() {
return Promise.resolve(SharingRestInfo);
},
Expand Down Expand Up @@ -244,6 +257,7 @@ describe("request()", () => {
FormData = oldFormData;

const MockFetchResponse = {
ok: true,
json() {
return Promise.resolve(SharingRestInfo);
},
Expand Down

0 comments on commit 14f5668

Please sign in to comment.