Merge remote-tracking branch 'trigger/MAGETWO-95501' into BugFixPR

Author: joanhe

app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js

@@ -8,8 +8,9 @@
  */
 define([
     'mage/url',
-    'Magento_Ui/js/model/messageList'
-], function (url, globalMessageList) {
+    'Magento_Ui/js/model/messageList',
+    'mage/translate'
+], function (url, globalMessageList, $t) {
     'use strict';
 
     return {
@@ -25,7 +26,11 @@ define([
             if (response.status == 401) { //eslint-disable-line eqeqeq
                 window.location.replace(url.build('customer/account/login/'));
             } else {
-                error = JSON.parse(response.responseText);
+                try {
+                    error = JSON.parse(response.responseText);
+                } catch (exception) {
+                    error = $t('Something went wrong with your request. Please try again later.');
+                }
                 messageContainer.addErrorMessage(error);
             }
         }

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js

@@ -0,0 +1,72 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento_Checkout/js/model/error-processor', function () {
+        var injector = new Squire(),
+            mocks = {
+                'mage/url': {
+                    /** Method stub. */
+                    build: jasmine.createSpy()
+                },
+                'Magento_Ui/js/model/messageList': jasmine.createSpy('globalList')
+            },
+            model;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Checkout/js/model/error-processor'
+            ], function (processor) {
+                model = processor;
+
+                done();
+            });
+        });
+
+        describe('Check process method', function () {
+            it('check on success response with valid response data', function () {
+                var messageObject = {
+                        message: 'Valid error message!'
+                    },
+                    messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
+
+                model.process({
+                    status: 200,
+                    responseText: JSON.stringify(messageObject)
+                }, messageContainer);
+                expect(messageContainer.addErrorMessage).toHaveBeenCalledWith(messageObject);
+            });
+
+            it('check on success response with invalid response data', function () {
+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
+
+                model.process({
+                    status: 200,
+                    responseText: ''
+                }, messageContainer);
+                expect(messageContainer.addErrorMessage)
+                    .toHaveBeenCalledWith('Something went wrong with your request. Please try again later.');
+            });
+
+            it('check on failed status', function () {
+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
+
+                spyOn(window.location, 'replace').and.callFake(function () {});
+                model.process({
+                    status: 401,
+                    responseText: ''
+                }, messageContainer);
+                expect(mocks['mage/url'].build)
+                    .toHaveBeenCalled();
+            });
+        });
+    });
+});