Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-94070

adifucan · adifucan · commit edae2f0d8036 · 2018-08-09T10:39:31.000+03:00
diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Cms\Api;
 
-use Magento\Framework\Api\SearchCriteriaInterface;
-
 /**
  * CMS block CRUD interface.
  * @api
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/VerifyTinyMCEActionGroup.xml
@@ -8,8 +8,6 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="VerifyTinyMCEActionGroup">
-        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" time="30" />
-        <seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4" />
         <seeElement selector="{{TinyMCESection.Style}}" stepKey="assertInfo2"/>
         <seeElement selector="{{TinyMCESection.Bold}}" stepKey="assertInfo3"/>
         <seeElement selector="{{TinyMCESection.Italic}}" stepKey="assertInfo4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
@@ -75,6 +75,7 @@
         <data key="extension">jpg</data>
         <data key="content">Image content. Yeah.</data>
         <data key="height">1000</data>
+        <data key="path">wysiwyg</data>
     </entity>
     <entity name="ImageFolder" type="uploadImage">
         <data key="name" unique="suffix">Test</data>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageContentSection.xml
@@ -19,6 +19,8 @@
         <element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
         <element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
         <element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="ImageAlt" type="text" selector="//img[contains(@alt,'{{var1}}')]" parameterized="true"/>
     </section>
     <section name="CmsDesignSection">
         <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -36,7 +36,7 @@
         <element name="Browse" type="button" selector=".mce-i-browse"/>
         <element name="BrowseUploadImage" type="file" selector=".fileupload" />
         <element name="image" type="text" selector="//small[text()='{{var1}}']" parameterized="true"/>
-        <element name="imageOrImageCopy" type="text" selector="//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
+        <element name="imageOrImageCopy" type="text" selector="//div[contains(@class,'media-gallery-modal')]//img[contains(@alt, '{{arg1}}.{{arg2}}')]|//img[contains(@alt,'{{arg1}}_') and contains(@alt,'.{{arg2}}')]" parameterized="true"/>
         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open" />
         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last" />
@@ -98,9 +98,6 @@
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
         <element name="ButtonToShow" type="multiselect" selector="select[name='parameters[show_buttons][]']"/>
-        <!--Widget on Storefront-->
-        <element name="CategoryWidget" type="text" selector="//a[@href='http://magento2.vagrant42/{{var1}}.html?___store=default']" parameterized="true"/>
-        <element name="CMSPageWidget" type="text" selector="//a[@href='http://magento2.vagrant42/home']"/>
         <!--Compare on Storefront-->
         <element name="ProductName" type="text" selector=".product.name.product-item-name" />
         <element name="CompareBtn" type="button" selector=".action.tocompare"/>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -29,4 +29,17 @@
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
     </actionGroup>
+    <actionGroup name="UseStaticURLForMediaContentInWYSIWYG">
+        <arguments>
+            <argument name="value" defaultValue="Yes" type="string"/>
+        </arguments>
+        <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{ContentManagementSection.EnableWYSIWYG}}" stepKey="waitForEnableWYSIWYGDropdown1" />
+        <selectOption selector="{{ContentManagementSection.StaticURL}}" userInput="{{value}}" stepKey="selectOption1"/>
+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -15,6 +15,7 @@
         <element name="EnableWYSIWYG" type="button" selector="#cms_wysiwyg_enabled"/>
         <element name="SwitcherSystemValue" type="button" selector="#cms_wysiwyg_editor_inherit"/>
         <element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
+        <element name="StaticURL" type="button" selector="#cms_wysiwyg_use_static_urls_in_catalog" />
         <element name="Save" type="button" selector="#save"/>
     </section>
     <section name="WebSection">
diff --git a/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js b/app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js
@@ -495,7 +495,7 @@ define([
          */
         encodeDirectives: function (content) {
             // collect all HTML tags with attributes that contain directives
-            return content.gsub(/<([a-z0-9\-\_]+[^>]+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".*?)>/i, function (match) {
+            return content.gsub(/<([a-z0-9\-\_]+[^>]+?)([a-z0-9\-\_]+="[^"]*?\{\{.+?\}\}.*?".*?)>/i, function (match) {
                 var attributesString = match[2],
                     decodedDirectiveString;
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -408,7 +408,7 @@ define([
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form
-            if (!isValid) {
+            if (this.source && !isValid) {
                 this.source.set('params.invalid', true);
             }
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -6,6 +6,7 @@
 /**
  * @api
  */
+/* global Base64 */
 define([
     'jquery',
     'underscore',
@@ -168,6 +169,10 @@ define([
         processFile: function (file) {
             file.previewType = this.getFilePreviewType(file);
 
+            if (!file.id && file.name) {
+                file.id = Base64.mageEncode(file.name);
+            }
+
             this.observe.call(file, true, [
                 'previewWidth',
                 'previewHeight'
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/image-uploader.js
@@ -17,6 +17,15 @@ define([
     'use strict';
 
     return Element.extend({
+        /**
+         * {@inheritDoc}
+         */
+        initialize: function () {
+            this._super();
+
+            // Listen for file deletions from the media browser
+            $(window).on('fileDeleted.mediabrowser', this.onDeleteFile.bind(this));
+        },
 
         /**
          * Assign uid for media gallery
@@ -76,6 +85,40 @@ define([
             browser.openDialog(openDialogUrl, null, null, this.mediaGallery.openDialogTitle);
         },
 
+        /**
+         * @param {jQuery.event} e
+         * @param {Object} data
+         * @returns {Object} Chainables
+         */
+        onDeleteFile: function (e, data) {
+            var fileId = this.getFileId(),
+                deletedFileIds = data.ids;
+
+            if (fileId && $.inArray(fileId, deletedFileIds) > -1) {
+                this.clear();
+            }
+
+            return this;
+        },
+
+        /**
+         * {@inheritDoc}
+         */
+        clear: function () {
+            this.value([]);
+
+            return this;
+        },
+
+        /**
+         * Gets the ID of the file used if set
+         *
+         * @return {String|Null} ID
+         */
+        getFileId: function () {
+            return this.hasData() ? this.value()[0].id : null;
+        },
+
         /**
          * Trigger native browser file upload UI via clicking on 'Upload' button
          *
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -340,6 +340,12 @@ define([
             var zIndex = this.modal.zIndex(),
                 baseIndex = zIndex + this._getVisibleCount();
 
+            if (this.modal.data('active')) {
+                return;
+            }
+
+            this.modal.data('active', true);
+
             this.overlay.zIndex(++baseIndex);
             this.prevOverlayIndex = this.overlay.zIndex();
             this.modal.zIndex(this.overlay.zIndex() + 1);
@@ -354,6 +360,7 @@ define([
          */
         _unsetActive: function () {
             this.modal.removeAttr('style');
+            this.modal.data('active', false);
 
             if (this.overlay) {
                 // In cases when one modal is closed but there is another modal open (e.g. admin notifications)
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutOfflinePaymentMethodsTest.xml
@@ -102,7 +102,7 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderButtonsAvailable" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
-            <data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 is not stable</data>
+            <data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 and 4 is not stable</data>
         </variation>
         <variation name="OnePageCheckoutTestVariation4" summary="One Page Checkout Products with Special Prices" ticketId="MAGETWO-12429">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
@@ -125,6 +125,7 @@
             <constraint name="Magento\Shipping\Test\Constraint\AssertShipmentSuccessCreateMessage" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>
+            <data name="issue" xsi:type="string">MAGETWO-66737: Magento\Checkout\Test\TestCase\OnePageCheckoutTest with OnePageCheckoutTestVariation3 and 4 is not stable</data>
         </variation>
         <variation name="OnePageCheckoutTestVariation5" summary="Guest Checkout using Check/Money Order and Free Shipping with Prices/Taxes Verifications" ticketId="MAGETWO-12412">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, severity:S0</data>
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -67,11 +67,13 @@ public function processAssert(SetupWizard $setupWizard)
             $setupWizard->getReadiness()->getDependencyCheck(),
             'Dependency check is incorrect.'
         );
-        \PHPUnit\Framework\Assert::assertContains(
-            self::PHP_VERSION_MESSAGE,
-            $setupWizard->getReadiness()->getPhpVersionCheck(),
-            'PHP version is incorrect.'
-        );
+        if ($setupWizard->getReadiness()->isPhpVersionCheckVisible()) {
+            \PHPUnit\Framework\Assert::assertContains(
+                self::PHP_VERSION_MESSAGE,
+                $setupWizard->getReadiness()->getPhpVersionCheck(),
+                'PHP version is incorrect.'
+            );
+        }
         \PHPUnit\Framework\Assert::assertContains(
             self::PHP_SETTING_REGEXP,
             $setupWizard->getReadiness()->getSettingsCheck(),
diff --git a/lib/web/mage/adminhtml/browser.js b/lib/web/mage/adminhtml/browser.js
@@ -435,6 +435,10 @@ define([
                         }).done($.proxy(function () {
                             self.reload();
                             self.element.find('#delete_files').toggleClass(self.options.hidden, true);
+
+                            $(window).trigger('fileDeleted.mediabrowser', {
+                                ids: ids
+                            });
                         }, this));
                     },
 
diff --git a/lib/web/mage/adminhtml/wysiwyg/events.js b/lib/web/mage/adminhtml/wysiwyg/events.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        afterInitialization: 'afterInitialization',
+        afterChangeContent: 'afterChangeContent',
+        afterUndo: 'afterUndo',
+        afterPaste: 'afterPaste',
+        beforeSetContent: 'beforeSetContent',
+        afterSetContent: 'afterSetContent',
+        afterSave: 'afterSave',
+        afterOpenFileBrowser: 'afterOpenFileBrowser',
+        afterFormSubmit: 'afterFormSubmit',
+        afterBlur: 'afterBlur',
+        afterFocus: 'afterFocus'
+    };
+});
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -7,7 +7,8 @@
 /* eslint-disable strict */
 define([
     'wysiwygAdapter',
-    'mage/adminhtml/events'
+    'mage/adminhtml/events',
+    'mage/adminhtml/wysiwyg/widget'
 ], function (wysiwyg, varienGlobalEvents) {
     return function (config) {
         tinymce.create('tinymce.plugins.magentowidget', {
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -8,12 +8,14 @@ define([
     'jquery',
     'underscore',
     'wysiwygAdapter',
+    'module',
     'mage/translate',
     'prototype',
     'mage/adminhtml/events',
     'mage/adminhtml/browser'
-], function (jQuery, _, wysiwygAdapter) {
-    var wysiwygSetup = Class.create({
+], function (jQuery, _, wysiwygAdapter, module) {
+    var baseConfig = module.config().config || {},
+        wysiwygSetup = Class.create({
         wysiwygInstance: null
     });
 
@@ -27,7 +29,10 @@ define([
             var WysiwygInstancePrototype = new wysiwygAdapter.getAdapterPrototype();
 
             _.bindAll(this, 'openFileBrowser');
+
+            config = Object.assign({}, baseConfig, config || {});
             this.wysiwygInstance = new WysiwygInstancePrototype(htmlId, config);
+            this.wysiwygInstance.eventBus = this.eventBus = new window.varienEvents();
         },
 
         /**
@@ -67,6 +72,9 @@ define([
         updateContent: function (content) {
             return this.wysiwygInstance.encodeContent(content);
         }
+
     };
     window.wysiwygSetup = wysiwygSetup;
+
+    return wysiwygSetup;
 });
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/themes/ui.css
@@ -15,6 +15,8 @@
     font-style: normal;
     font-size: 14px;
     color: #000;
+    box-sizing: initial;
+    word-break: break-all;
 }
 
 .magento-placeholder-error {
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ define([`
`408`	`408`	`this.bubble('error', message);`
`409`	`409`
`410`	`410`	`//TODO: Implement proper result propagation for form`
`411`		`- if (!isValid) {`
	`411`	`+ if (this.source && !isValid) {`
`412`	`412`	`this.source.set('params.invalid', true);`
`413`	`413`	`}`
`414`	`414`