Merge remote-tracking branch 'origin/MC-17754' into 2.2-develop-pr105

Author: svitja

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

@@ -9,8 +9,9 @@
 define([
     'mage/url',
     'Magento_Ui/js/model/messageList',
-    'consoleLogger'
-], function (url, globalMessageList, consoleLogger) {
+    'consoleLogger',
+    'mage/translate'
+], function (url, globalMessageList, consoleLogger, $t) {
     'use strict';
 
     return {
@@ -28,10 +29,13 @@ define([
             } else {
                 try {
                     error = JSON.parse(response.responseText);
-                    messageContainer.addErrorMessage(error);
                 } catch (e) {
                     consoleLogger.error(e);
+                    error = {
+                        message: $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,64 @@
+/**
+ * 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': {
+                    build: jasmine.createSpy()
+                },
+                'consoleLogger': jasmine.createSpy('logger')
+            },
+            model,
+            loggerModel;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Checkout/js/model/error-processor',
+                'consoleLogger'
+            ], function (processor, logger) {
+                model = processor;
+                loggerModel = logger;
+
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
+        describe('Check process method', function () {
+            it('check on success response with invalid response data', function () {
+                var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']),
+                    messageObject = {
+                        message: 'Something went wrong with your request. Please try again later.'
+                    };
+
+                spyOn(loggerModel, 'error');
+
+                model.process({
+                    status: 200,
+                    responseText: ''
+                }, messageContainer);
+
+                expect(loggerModel.error).toHaveBeenCalled();
+
+                expect(messageContainer.addErrorMessage)
+                    .toHaveBeenCalledWith(messageObject);
+            });
+        });
+    });
+});