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

Author: svitja

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php

@@ -38,8 +38,7 @@ protected function setUp()
 
     public function testEstimateRowSize()
     {
-        $this->markTestSkipped('Unskip after MAGETWO-89738');
-        $expectedValue = 2400000;
+        $expectedValue = 4000000;
 
         $this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100);
         $collectionMock = $this->createMock(\Magento\Customer\Model\ResourceModel\Group\Collection::class);

app/code/Magento/ReleaseNotification/Ui/DataProvider/Modifier/Notifications.php

@@ -192,9 +192,9 @@ private function hideNotification(array $meta)
      */
     private function getNotificationContent()
     {
-        $version = $this->getTargetVersion();
-        $edition = $this->productMetadata->getEdition();
-        $locale = $this->session->getUser()->getInterfaceLocale();
+        $version = strtolower($this->getTargetVersion());
+        $edition = strtolower($this->productMetadata->getEdition());
+        $locale = strtolower($this->session->getUser()->getInterfaceLocale());
 
         $cacheKey = self::$cachePrefix . $version . "-" . $edition . "-" . $locale;
         $modalContent = $this->cacheStorage->load($cacheKey);

app/code/Magento/ReleaseNotification/etc/config.xml

@@ -9,7 +9,7 @@
     <default>
         <system>
             <release_notification>
-                <content_url>raw.githubusercontent.com/magento-arcticfoxes/release-notification/master</content_url>
+                <content_url>magento.com/release_notifications</content_url>
                 <use_https>1</use_https>
             </release_notification>
         </system>

app/code/Magento/Ui/view/base/web/js/form/element/url-input.js

@@ -133,7 +133,7 @@ define([
         createChildUrlInputComponent: function (value) {
             var elementConfig;
 
-            if (_.isUndefined(this.linkedElementInstances[value])) {
+            if (!_.isEmpty(value) && _.isUndefined(this.linkedElementInstances[value])) {
                 elementConfig = this.urlTypes[value];
                 layout([elementConfig]);
                 this.linkedElementInstances[value] = this.requestModule(elementConfig.name);

app/code/Magento/Ui/view/base/web/js/lib/key-codes.js

@@ -20,6 +20,9 @@ define([], function () {
         39: 'pageRightKey',
         17: 'ctrlKey',
         18: 'altKey',
-        16: 'shiftKey'
+        16: 'shiftKey',
+        66: 'bKey',
+        73: 'iKey',
+        85: 'uKey'
     };
 });

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminSwitchWYSIWYGOptionsCest.xml

@@ -16,8 +16,6 @@
             <title value="Admin are able to switch between versions of TinyMCE."/>
             <description value="Admin are able to switch between versions of TinyMCE."/>
             <severity value="CRITICAL"/>
-            <group value="skip"/>
-            <!-- Skipped; see MAGETWO-89417 -->
             <testCaseId value="MAGETWO-82936"/>
             <!--Skip because of issue MAGETWO-89417-->
             <group value="skip"/>
@@ -27,6 +25,7 @@
             <actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
         </before>
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
+        <waitForPageLoad stepKey="wait1"/>
         <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox1" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue1"/>
@@ -35,7 +34,7 @@
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <waitForPageLoad stepKey="wait2"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
@@ -54,6 +53,7 @@
         <!--see widget on Storefront-->
         <see userInput="Hello TinyMCE4!" stepKey="seeContent1"/>
         <amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage2"/>
+        <waitForPageLoad stepKey="wait4"/>
         <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
         <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
@@ -62,7 +62,7 @@
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <waitForPageLoad stepKey="wait5"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
@@ -77,7 +77,7 @@
         <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage2"/>
         <!-- Go to storefront cms page, assert cms content -->
         <amOnPage url="{{simpleCmsPage.identifier}}" stepKey="amOnPageTestPage2"/>
-        <waitForPageLoad stepKey="wait4" />
+        <waitForPageLoad stepKey="wait6" />
         <!--see widget on Storefront-->
         <see userInput="Hello TinyMCE3!" stepKey="seeContent2"/>
         <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Test/AdminCreateCustomerTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MAGETWO-72095"/>
             <group value="customer"/>
             <group value="create"/>
+            <group value="skip"/>
         </annotations>
         <after>
             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>

lib/web/jquery/jstree/jquery.hotkeys.js

@@ -48,8 +48,12 @@
 
 		handleObj.handler = function( event ) {
 			// Don't fire in text-accepting inputs that we didn't directly bind to
+            /**
+             * Modified by Magento to ensure it doesn't fire on any content editable areas. This library is no
+             * longer maintained by its author however we require content editable to behave as expected.
+             */
 			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				 event.target.type === "text") ) {
+				 event.target.type === "text" || jQuery(event.target).attr('contenteditable')) ) {
 				return;
 			}