Improve error responses handling

Author: antoinegrant

Diff for: packages/theme-predictive-search/__tests__/request.test.js

@@ -63,9 +63,7 @@ describe("request()", () => {
 
       jest.runAllTimers();
 
-      expect(spyOnError).toHaveBeenCalledWith(
-        new Error("An error ocurred whilst sending the request.")
-      );
+      expect(spyOnError).toHaveBeenCalledWith(new Error("Request Error"));
     });
 
     it("fails with an invalid Content-Type header", () => {
@@ -81,9 +79,7 @@ describe("request()", () => {
 
       jest.runAllTimers();
 
-      expect(spyOnError).toHaveBeenCalledWith(
-        new Error("An error ocurred whilst sending the request.")
-      );
+      expect(spyOnError).toHaveBeenCalledWith(new Error("Request Error"));
     });
 
     it("fails in the absence of Content-Type header", () => {
@@ -96,9 +92,7 @@ describe("request()", () => {
 
       jest.runAllTimers();
 
-      expect(spyOnError).toHaveBeenCalledWith(
-        new Error("An error ocurred whilst sending the request.")
-      );
+      expect(spyOnError).toHaveBeenCalledWith(new Error("Request Error"));
     });
   });
 
@@ -116,9 +110,7 @@ describe("request()", () => {
 
       jest.runAllTimers();
 
-      expect(spyOnError).toHaveBeenCalledWith(
-        new Error("An error ocurred whilst sending the request.")
-      );
+      expect(spyOnError).toHaveBeenCalledWith(new Error("Request Error"));
     });
 
     describe("422", () => {
@@ -212,5 +204,45 @@ describe("request()", () => {
         expect(spyOnError).toHaveBeenCalledTimes(1);
       });
     });
+
+    describe("417", () => {
+      it("head request", () => {
+        const spyOnError = jest.fn();
+        xhrMock.get(/^\/search\/suggest\.json/g, (req, res) =>
+          res
+            .status(417)
+            .header("Content-Type", "application/json; charset=utf-8")
+            .body(
+              JSON.stringify({
+                status: 417,
+                message: "Expectation Failed",
+                description: "Unsupported shop primary locale"
+              })
+            )
+        );
+
+        request("config=foo", "foo-417", null, spyOnError);
+
+        jest.runAllTimers();
+
+        const error = new Error();
+        error.name = "Expectation Failed";
+        error.message = "Unsupported shop primary locale";
+        expect(spyOnError).toHaveBeenCalledWith(error);
+      });
+    });
+  });
+
+  describe("500", () => {
+    it("head request", () => {
+      const spyOnError = jest.fn();
+      xhrMock.get(/^\/search\/suggest\.json/g, (req, res) => res.status(500));
+
+      request("config=foo", "foo-500", null, spyOnError);
+
+      jest.runAllTimers();
+
+      expect(spyOnError).toHaveBeenCalledWith(new Error("Server Error"));
+    });
   });
 });

Diff for: packages/theme-predictive-search/src/request.js

@@ -5,16 +5,22 @@ export default function request(configParams, query, onSuccess, onError) {
     if (xhr.readyState === XMLHttpRequest.DONE) {
       var contentType = xhr.getResponseHeader("Content-Type");
 
+      if (xhr.status >= 500) {
+        onError(new Error("Server Error"));
+
+        return;
+      }
+
       if (
         typeof contentType !== "string" ||
         contentType.toLowerCase().match("application/json") === null
       ) {
-        onError(new Error("An error ocurred whilst sending the request."));
+        onError(new Error("Request Error"));
 
         return;
       }
 
-      if (xhr.status >= 200 && xhr.status < 300) {
+      if (xhr.status === 200) {
         try {
           var res = JSON.parse(xhr.responseText);
           res.query = query;
@@ -59,7 +65,7 @@ export default function request(configParams, query, onSuccess, onError) {
         return;
       }
 
-      onError(new Error("An error ocurred whilst sending the request."));
+      onError(new Error("Request Error"));
 
       return;
     }