Merge remote-tracking branch 'mainline/2.3.0-release' into 2.3.0-qwerty-bugs

Author: cpartica

app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json

@@ -15,7 +15,8 @@
         },
         "constraint": {
             "PRIMARY": true,
-            "MAGENTO_BULK_UUID": true
+            "MAGENTO_BULK_UUID": true,
+            "MAGENTO_BULK_USER_ID_ADMIN_USER_USER_ID": true
         }
     },
     "magento_operation": {

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);
             }
         }

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml

@@ -17,20 +17,17 @@
             <description value="Verify that admin is able to upload image to CMS Page with TinyMCE3 enabled"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95725"/>
-            <skip>
-                <issueId value="MAGETWO-95799"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
             <!-- Choose TinyMCE3 as the default WYSIWYG editor-->
-            <actionGroup ref="SwitchToTinyMCE3" stepKey="switchToTinyMCE3"/>
+            <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
         </before>
         <after>
             <!-- Switch WYSIWYG editor to TinyMCE4-->
             <comment userInput="Reset editor as TinyMCE4" stepKey="chooseTinyMCE4AsEditor"/>
-            <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4"/>
+            <magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
@@ -39,6 +36,7 @@
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
         <seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
+        <wait time="3" stepKey="waiting"/>
         <comment userInput="Click Insert image button" stepKey="clickImageButton"/>
         <click selector="{{TinyMCESection.InsertImageBtnTinyMCE3}}" stepKey="clickInsertImage" />
         <waitForPageLoad stepKey="waitForiFrameToLoad" />

app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml

@@ -28,6 +28,7 @@
     <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
     <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
     <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+    <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
     </actionGroup>
     <actionGroup name="DisabledWYSIWYG">
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToConfigurationPage" />

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();
+            });
+        });
+    });
+});

lib/internal/Magento/Framework/Setup/Declaration/Schema/Operations/DropReference.php

@@ -35,26 +35,23 @@ public function __construct(DropElement $dropElement)
     }
 
     /**
-     * {@inheritdoc}
-     * We can drop references and this will not cause any issues.
-     *
-     * @return bool
+     * @inheritdoc
      */
     public function isOperationDestructive()
     {
-        return false;
+        return true;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOperationName()
     {
         return self::OPERATION_NAME;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function doOperation(ElementHistory $elementHistory)
     {