Merge remote-tracking branch 'mainline/2.3-develop' into MC-18365

Oleksandr Dubovyk · Oleksandr Dubovyk · commit 7e92a37635c4 · 2019-08-15T13:51:35.000-05:00
diff --git a/app/code/Magento/AdminNotification/README.md b/app/code/Magento/AdminNotification/README.md
@@ -1,4 +1,30 @@
-# Admin Notification
+# Magento_AdminNotification module
 
-**Admin Notification** provides the ability to alert administrators via
-system messages and provides a message inbox for surveys and notifications.
+The Magento_AdminNotification module provides the ability to alert administrators via system messages and provides a message inbox for surveys and notifications.
+
+## Installation details
+
+Before disabling or uninstalling this module, note that the Magento_Indexer module depends on this module.
+
+For information about module installation in Magento 2, see [Enable or disable modules](http://devdocs.magento.com/guides/v2.3/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+### Events
+
+This module observes the following events:
+
+ - `controller_action_predispatch` event in `Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver`
+
+### Layouts
+
+This module introduces the following layouts and layout handles in the `view/adminhtml/layout` directory:
+
+- `adminhtml_notification_index`
+- `adminhtml_notification_block`
+
+For more information about layouts in Magento 2, see the [Layout documentation](http://devdocs.magento.com/guides/v2.3/frontend-dev-guide/layouts/layout-overview.html).
+
+### UI components
+
+You can extend admin notifications using the `view/adminhtml/ui_component/notification_area.xml` configuration file.
+
+For information about UI components in Magento 2, see [Overview of UI components](http://devdocs.magento.com/guides/v2.3/ui_comp_guide/bk-ui_comps.html).
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
@@ -143,6 +143,9 @@
         <reloadPage stepKey="reloadDuplicatedProductPage"/>
         <waitForPageLoad stepKey="waitForDuplicatedProductReload"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="createConfigurationsDuplicatedProduct"/>
+        <waitForElementVisible selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="waitForCreateConfigurationsPageLoad"/>
+        <click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminGridSelectRows.multicheckOption('Deselect All')}}" stepKey="DeselectAllAttributes"/>
         <actionGroup ref="createOptionsForAttribute" stepKey="createOptionsForDuplicatedProduct">
             <argument name="attributeName" value="{{productAttributeColor.default_label}}"/>
             <argument name="firstOptionName" value="{{colorConfigurableProductAttribute1.name}}"/>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/product_attributes_listing.xml
@@ -55,6 +55,7 @@
         <selectionsColumn name="ids" sortOrder="0">
             <settings>
                 <indexField>attribute_id</indexField>
+                <preserveSelectionsOnFilter>true</preserveSelectionsOnFilter>
             </settings>
         </selectionsColumn>
         <column name="attribute_code">
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -290,10 +290,12 @@
                 <label>Online Customers Options</label>
                 <field id="online_minutes_interval" translate="label comment" type="text" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Online Minutes Interval</label>
+                    <validate>validate-number validate-greater-than-zero</validate>
                     <comment>Leave empty for default (15 minutes).</comment>
                 </field>
                 <field id="section_data_lifetime" translate="label comment" type="text" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Customer Data Lifetime</label>
+                    <validate>validate-number validate-greater-than-zero</validate>
                     <comment>Please specify value in minutes.</comment>
                 </field>
             </group>
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -183,6 +183,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Order Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Order Email Copy Method</label>
@@ -212,6 +213,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Order Comment Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Order Comments Email Copy Method</label>
@@ -241,6 +243,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Invoice Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Invoice Email Copy Method</label>
@@ -270,6 +273,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Invoice Comment Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Invoice Comments Email Copy Method</label>
@@ -299,6 +303,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Shipment Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Shipment Email Copy Method</label>
@@ -328,6 +333,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Shipment Comment Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Shipment Comments Email Copy Method</label>
@@ -357,6 +363,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Credit Memo Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Credit Memo Email Copy Method</label>
@@ -386,6 +393,7 @@
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Credit Memo Comment Email Copy To</label>
                     <comment>Comma-separated</comment>
+                    <validate>validate-emails</validate>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Send Credit Memo Comments Email Copy Method</label>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml b/app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistSection.xml
@@ -12,7 +12,7 @@
         <element name="pageTitle" type="text" selector="h1.page-title"/>
         <element name="successMsg" type="text" selector="div.message-success.success.message"/>
         <element name="productItemNameText" type="text" selector=".products-grid .product-item-name a"/>
-        <element name="removeWishlistButton" type="button" selector=".products-grid .btn-remove.action.delete>span" timeout="30"/>
+        <element name="removeWishlistButton" type="button" selector="//main//li[.//a[contains(text(), '{{prodName}}')]]//a[@data-role='remove']" parameterized="true" timeout="30"/>
         <element name="emptyWishlistText" type="text" selector=".message.info.empty>span"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeletePersistedWishlistTest.xml
@@ -16,9 +16,6 @@
             <severity value="AVERAGE"/>
             <group value="wishlist"/>
             <testCaseId value="MC-4110"/>
-            <skip>
-                <issueId value="MQE-1145"/>
-            </skip>
         </annotations>
         <before>
             <createData stepKey="category" entity="SimpleSubCategory"/>
@@ -39,19 +36,20 @@
         </after>
 
         <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
+        <waitForPageLoad stepKey="waitForLoginPage"/>
         <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
         <fillField  stepKey="fillPassword" userInput="$$customer.password$$" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
         <waitForElementVisible stepKey="waitForButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
         <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
         <see stepKey="seeFirstName" userInput="$$customer.firstname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         <see stepKey="seeLastName" userInput="$$customer.lastname$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
         <see stepKey="seeEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}" />
-        <waitForPageLoad stepKey="15"/>
         <amOnPage stepKey="amOnWishlist" url="{{StorefrontCustomerWishlistPage.url}}"/>
-        <see stepKey="seeWishlist" userInput="$$product.name$$" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-        <moveMouseOver stepKey="mouseOver" selector="{{StorefrontCustomerWishlistSection.productItemNameText}}"/>
-        <waitForElementVisible stepKey="waitForRemoveButton" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
-        <click stepKey="clickRemove" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton}}"/>
+        <waitForPageLoad stepKey="waitForWishlist"/>
+        <see stepKey="seeWishlist" userInput="$$product.price$$" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName($$product.name$$)}}"/>
+        <moveMouseOver stepKey="mouseOver" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName($$product.name$$)}}"/>
+        <waitForElementVisible stepKey="waitForRemoveButton" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton($$product.name$$)}}"/>
+        <click stepKey="clickRemove" selector="{{StorefrontCustomerWishlistSection.removeWishlistButton($$product.name$$)}}"/>
         <see stepKey="seeEmptyWishlist" userInput="You have no items in your wish list" selector="{{StorefrontCustomerWishlistSection.emptyWishlistText}}"/>
     </test>
 </tests>
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
@@ -102,7 +102,12 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
      */
     public function doRun(Console\Input\InputInterface $input, Console\Output\OutputInterface $output)
     {
-        $exitCode = parent::doRun($input, $output);
+        $exitCode = null;
+        try {
+            $exitCode = parent::doRun($input, $output);
+        } catch (\Exception $e) {
+            $output->writeln($e->getTraceAsString());
+        }
 
         if ($this->initException) {
             throw $this->initException;
@@ -209,6 +214,7 @@ protected function getVendorCommands($objectManager)
         $commands = [];
         foreach (CommandLocator::getCommands() as $commandListClass) {
             if (class_exists($commandListClass)) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $commands = array_merge(
                     $commands,
                     $objectManager->create($commandListClass)->getCommands()
diff --git a/lib/web/mage/collapsible.js b/lib/web/mage/collapsible.js
@@ -15,8 +15,8 @@ define([
     var hideProps = {},
         showProps = {};
 
-    hideProps.height =  'hide';
-    showProps.height =  'show';
+    hideProps.height = 'hide';
+    showProps.height = 'show';
 
     $.widget('mage.collapsible', {
         options: {
@@ -66,7 +66,7 @@ define([
 
             this.element.on('dimensionsChanged', function (e) {
                 if (e.target && e.target.classList.contains('active')) {
-                    this._scrollToTopIfVisible(e.target);
+                    this._scrollToTopIfNotVisible();
                 }
             }.bind(this));
 
@@ -309,7 +309,7 @@ define([
 
             if (event) {
                 $.each(event.split(' '), function (index, eventName) {
-                    self.events[ eventName ] = '_eventHandler';
+                    self.events[eventName] = '_eventHandler';
                 });
             }
             this._off(this.trigger);
@@ -567,24 +567,35 @@ define([
         },
 
         /**
-         * @param {HTMLElement} elem
          * @private
          */
-        _scrollToTopIfVisible: function (elem) {
-            if (!this._isElementOutOfViewport(elem)) {
-                elem.scrollIntoView();
+        _scrollToTopIfNotVisible: function () {
+            if (this._isElementOutOfViewport()) {
+                this.header[0].scrollIntoView();
             }
         },
 
         /**
-         * @param {HTMLElement} elem
          * @private
          * @return {Boolean}
          */
-        _isElementOutOfViewport: function (elem) {
-            var rect = elem.getBoundingClientRect();
-
-            return rect.bottom < 0 || rect.right < 0 || rect.left > window.innerWidth || rect.top > window.innerHeight;
+        _isElementOutOfViewport: function () {
+            var headerRect = this.header[0].getBoundingClientRect(),
+                contentRect = this.content.get().length ? this.content[0].getBoundingClientRect() : false,
+                headerOut,
+                contentOut;
+
+            headerOut = headerRect.bottom - headerRect.height < 0 ||
+                headerRect.right - headerRect.width < 0 ||
+                headerRect.left + headerRect.width > window.innerWidth ||
+                headerRect.top + headerRect.height > window.innerHeight;
+
+            contentOut = contentRect ? contentRect.bottom - contentRect.height < 0 ||
+                contentRect.right - contentRect.width < 0 ||
+                contentRect.left + contentRect.width > window.innerWidth ||
+                contentRect.top + contentRect.height > window.innerHeight : false;
+
+            return headerOut ? headerOut : contentOut;
         }
     });
 
