Merge branches '2.3-develop' and '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-56441

Author: Oleksandr Gorkun

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

@@ -11,15 +11,16 @@
     <test name="AdminDashboardWithChartsTest">
         <annotations>
             <features value="Backend"/>
-            <title value="Google chart on Magento dashboard"/>
-            <description value="Google chart on Magento dashboard page is not broken"/>
+            <stories value="Google Charts on Magento dashboard"/>
+            <title value="Admin should see Google chart on Magento dashboard"/>
+            <description value="Google chart on Magento dashboard page is displaying properly"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-98934"/>
             <useCaseId value="MAGETWO-98584"/>
             <group value="backend"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set admin/dashboard/enable_charts 1"  stepKey="setEnableCharts" />
+            <magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>
             <createData entity="SimpleProduct2" stepKey="createProduct">
                 <field key="price">150</field>
             </createData>
@@ -33,7 +34,7 @@
             <comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <waitForLoadingMaskToDisappear stepKey="waitForLoadingOrderGrid"/>
-            <magentoCLI command="config:set admin/dashboard/enable_charts 0"  stepKey="setDisableChartsAsDefault" />
+            <magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="logout" stepKey="logout"/>
@@ -47,7 +48,7 @@
         <!-- Login as customer -->
         <comment userInput="Login as customer" stepKey="loginAsCustomer"/>
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
-            <argument name="Customer" value="$$createCustomer$$" />
+            <argument name="Customer" value="$$createCustomer$$"/>
         </actionGroup>
         <!-- Add Product to Shopping Cart-->
         <comment userInput="Add product to the shopping cart" stepKey="addProductToCart"/>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

@@ -7,13 +7,15 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAfterJSMinificationTest">
         <annotations>
             <features value="Backend"/>
+            <stories value="Admin Panel JS minification"/>
             <title value="Admin panel should be accessible with JS minification enabled"/>
             <description value="Admin panel should be accessible with JS minification enabled"/>
-            <testCaseId value="MC-14104" />
+            <testCaseId value="MC-14104"/>
+            <severity value="MAJOR"/>
             <group value="backend"/>
             <group value="mtf_migrated"/>
         </annotations>

app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml

@@ -11,9 +11,11 @@
     <test name="AdminUserLoginWithStoreCodeInUrlTest">
         <annotations>
             <features value="Backend"/>
+            <stories value="Admin Panel URL with Store Code"/>
             <title value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
             <description value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
-            <testCaseId value="MC-14279" />
+            <testCaseId value="MC-14279"/>
+            <severity value="CRITICAL"/>
             <group value="backend"/>
             <group value="mtf_migrated"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95933"/>
             <group value="Bundle"/>
+            <skip>
+                <issueId value="MC-16684"/>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>

app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml

@@ -11,8 +11,9 @@
     <test name="AddOutOfStockProductToCompareListTest">
         <annotations>
             <features value="Catalog"/>
-            <title value="Add out of stock product to compare list"/>
-            <description value="Add out of stock product to compare list"/>
+            <stories value="Product Comparison for products Out of Stock"/>
+            <title value="Add Product that is Out of Stock product to Product Comparison"/>
+            <description value="Customer should be able to add Product that is Out Of Stock to the Product Comparison"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-98644"/>
             <useCaseId value="MAGETWO-98522"/>
@@ -58,15 +59,15 @@
         <waitForPageLoad stepKey="waitForProdAddToCmpList"/>
         <!--Assert success message-->
         <comment userInput="Assert success message" stepKey="assertSuccessMsg"/>
-        <grabTextFrom  selector="{{AdminProductMessagesSection.successMessage}}"  stepKey="grabTextFromSuccessMessage"/>
+        <grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage"/>
         <assertEquals expected='You added product $$product.name$$ to the comparison list.' expectedType="string" actual="($grabTextFromSuccessMessage)" stepKey="assertSuccessMessage"/>
         <!--See product in the comparison list-->
         <comment userInput="See product in the comparison list" stepKey="seeProductInComparisonList"/>
         <amOnPage url="{{StorefrontProductComparePage.url}}" stepKey="navigateToComparePage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductComparePageLoad"/>
         <seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName($product.name$)}}" stepKey="seeProductInCompareList"/>
         <!--Go to Category page and delete product from comparison list-->
-        <comment userInput="Go to Category page and delete prduct from comparison list" stepKey="deletProdFromCmpList"/>
+        <comment userInput="Go to Category page and delete product from comparison list" stepKey="deleteProdFromCmpList"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
         <click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
@@ -80,7 +81,7 @@
         <waitForPageLoad stepKey="waitProdAddingToCmpList"/>
         <!--Assert success message-->
         <comment userInput="Assert success message" stepKey="assertSuccessMsg2"/>
-        <grabTextFrom  selector="{{AdminProductMessagesSection.successMessage}}"  stepKey="grabTextFromSuccessMessage2"/>
+        <grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage2"/>
         <assertEquals expected='You added product $$product.name$$ to the comparison list.' expectedType="string" actual="($grabTextFromSuccessMessage)" stepKey="assertSuccessMessage2"/>
         <!--Check that product displays on add to compare widget-->
         <comment userInput="Check that product displays on add to compare widget" stepKey="checkProdNameOnWidget"/>

app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml

@@ -17,6 +17,9 @@
             <description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-87435"/>
+            <skip>
+                <issueId value="MC-16684"/>
+            </skip>
         </annotations>
         <before>
             <resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>

app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -393,4 +393,40 @@ public function dataProviderGetSavePercent()
             ['basePrice' => '20.80', 'tierPrice' => '18.72', 'savedPercent' => '10']
         ];
     }
+
+    /**
+     * @param null|string|float $quantity
+     * @param float $expectedValue
+     * @dataProvider getQuantityDataProvider
+     */
+    public function testGetQuantity($quantity, $expectedValue)
+    {
+        $tierPrice = new TierPrice(
+            $this->product,
+            $quantity,
+            $this->calculator,
+            $this->priceCurrencyMock,
+            $this->session,
+            $this->groupManagement,
+            $this->customerGroupRetriever
+        );
+
+        $this->assertEquals($expectedValue, $tierPrice->getQuantity());
+    }
+
+    /**
+     * @return array
+     */
+    public function getQuantityDataProvider()
+    {
+        return [
+            [null, 1],
+            ['one', 1],
+            ['', 1],
+            [4, 4],
+            [4.5, 4.5],
+            ['0.7', 0.7],
+            ['0.0000000', 1]
+        ];
+    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php

@@ -67,7 +67,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -76,6 +77,8 @@ public function modifyData(array $data)
     }
 
     /**
+     * Check if can add attributes on product form.
+     *
      * @return boolean
      */
     private function canAddAttributes()
@@ -89,7 +92,8 @@ private function canAddAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -111,6 +115,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
+     * Modify meta customize attribute modal.
+     *
      * @param array $meta
      * @return array
      */
@@ -207,6 +213,8 @@ private function customizeAddAttributeModal(array $meta)
     }
 
     /**
+     * Modify meta to customize create attribute modal.
+     *
      * @param array $meta
      * @return array
      */
@@ -289,6 +297,8 @@ private function customizeCreateAttributeModal(array $meta)
     }
 
     /**
+     * Modify meta to customize attribute grid.
+     *
      * @param array $meta
      * @return array
      */
@@ -309,7 +319,7 @@ private function customizeAttributesGrid(array $meta)
                         'immediateUpdateBySelection' => true,
                         'behaviourType' => 'edit',
                         'externalFilterMode' => true,
-                        'dataLinks' => ['imports' => false, 'exports' => true],
+                        'dataLinks' => ['imports' => false, 'exports' => false],
                         'formProvider' => 'ns = ${ $.namespace }, index = product_form',
                         'groupCode' => static::GROUP_CODE,
                         'groupName' => static::GROUP_NAME,

app/code/Magento/Catalog/etc/crontab.xml

@@ -16,7 +16,7 @@
         <job name="catalog_product_outdated_price_values_cleanup" instance="Magento\Catalog\Cron\DeleteOutdatedPriceValues" method="execute">
             <schedule>* * * * *</schedule>
         </job>
-        <job name="catalog_product_frontend_actions_flush" instance="Magento\Catalog\Cron\DeleteOutdatedPriceValues" method="execute">
+        <job name="catalog_product_frontend_actions_flush" instance="Magento\Catalog\Cron\FrontendActionsFlush" method="execute">
             <schedule>* * * * *</schedule>
         </job>
         <job name="catalog_product_attribute_value_synchronize" instance="Magento\Catalog\Cron\SynchronizeWebsiteAttributes" method="execute">

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml

@@ -15,6 +15,9 @@
             <testCaseId value="MC-14715"/>
             <severity value="CRITICAL"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-16684"/>
+            </skip>
         </annotations>
 
         <before>