Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-356

Author: Mohan Ahuja

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminLoginActionGroup.xml

@@ -14,8 +14,7 @@
         </annotations>
         <arguments>
             <argument name="username" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
-            <argument name="password" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-        </arguments>
+            <argument name="password" type="string" defaultValue="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}"/></arguments>
 
         <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
         <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{username}}" stepKey="fillUsername"/>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml

@@ -20,7 +20,7 @@
         <element name="productImageInFotorama" type="file" selector=".fotorama__nav__shaft img[src*='{{imageName}}']" parameterized="true" timeout="30"/>
         <element name="fotoramaPrevButton" type="button" selector="//*[@data-gallery-role='gallery']//*[@data-gallery-role='nav-wrap']//*[@data-gallery-role='arrow' and contains(@class, 'fotorama__thumb__arr--left')]" timeout="30"/>
         <element name="fotoramaNextButton" type="button" selector="//*[@data-gallery-role='gallery']//*[@data-gallery-role='nav-wrap']//*[@data-gallery-role='arrow' and contains(@class, 'fotorama__thumb__arr--right')]" timeout="30"/>
-        <element name="fotoramaNextButtonVideo" type="button" selector="div.fotorama__arr.fotorama__arr--next.fotorama__arr--shown" timeout="30"/>
+        <element name="fotoramaNextButtonVideo" type="button" selector="div.fotorama__arr.fotorama__arr--next.fotorama__arr--next" timeout="30"/>
         <element name="fotoramaAnyMedia" type="text" selector=".fotorama__nav__shaft img"/>
         <element name="fotoramaImageThumbnail" type="block" selector="//div[contains(@class, 'fotorama__nav__shaft')]//div[contains(@class, 'fotorama__nav__frame--thumb')][{{imageNumber}}]" parameterized="true" timeout="30"/>
         <element name="fotoramaImageThumbnailImgByNumber" type="block" selector="//div[contains(@class, 'fotorama__nav__shaft')]//div[contains(@class, 'fotorama__nav__frame--thumb')][{{imageNumber}}]//img" parameterized="true" timeout="30"/>

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

@@ -228,9 +228,10 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage5"/>
         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton5"/>
         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="waitForcustomerGroupPriceDeleteButton"/>
-        <scrollTo selector="(//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//tr//button[@data-action='remove_row'])[1]" x="30" y="0" stepKey="scrollToDeleteFirstRowOfCustomerGroupPrice"/>
-        <click selector="(//tr//button[@data-action='remove_row'])[1]" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
-        <click selector="//tr//button[@data-action='remove_row']" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
+        <scrollTo selector="//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//table[@class='admin__dynamic-rows admin__control-table']//button[@class='action-delete'][1]" stepKey="scrollToDeleteFirstRowOfCustomerGroupPrice"/>
+        <click selector="//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//table[@class='admin__dynamic-rows admin__control-table']//button[@class='action-delete'][1]" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
+        <waitForElementVisible selector="//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//table[@class='admin__dynamic-rows admin__control-table']//button[@class='action-delete'][1]" stepKey="waitForSecondRowDeleteButton"/>
+        <click selector="//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//table[@class='admin__dynamic-rows admin__control-table']//button[@class='action-delete'][1]" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="clickDoneButton5"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct5"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage6"/>

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

@@ -18,10 +18,10 @@
             <testCaseId value="MC-26305"/>
             <group value="catalog"/>
             <group value="productVideo"/>
+            <group value="pr_exclude"/>
             <skip>
-                <issueId value="MC-33903"/>
+                <issueId value="AC-2668"/>
             </skip>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="SimpleProduct2" stepKey="createProduct"/>

app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

@@ -332,7 +332,7 @@
         <data key="telephone">333-33-333-33</data>
         <data key="country">Germany</data>
         <data key="state">Berlin</data>
-        <data key="vatNumber">DE257486969</data>
+        <data key="vatNumber">111607872</data>
     </entity>
     <entity name="US_Address_California">
         <data key="firstname">John</data>

setup/src/Magento/Setup/Console/Command/GenerateFixturesCommand.php

@@ -112,6 +112,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $indexer->setScheduled($indexersState[$indexerId['indexer_id']]);
             }
 
+            $this->optimizeTables($fixtureModel->getObjectManager(), $output);
+
             /** @var \Magento\Setup\Fixtures\IndexersStatesApplyFixture $indexerFixture */
             $indexerFixture = $fixtureModel
                 ->getFixtureByName(\Magento\Setup\Fixtures\IndexersStatesApplyFixture::class);
@@ -168,4 +170,22 @@ private function executeFixture(\Magento\Setup\Fixtures\Fixture $fixture, Output
         $resultTime = (int) ($endTime - $startTime);
         $output->writeln('<info> done in ' . gmdate('H:i:s', $resultTime) . '</info>');
     }
+
+    /**
+     * Optimize tables after entities generation.
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param OutputInterface $output
+     * @return void
+     */
+    private function optimizeTables(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        OutputInterface $output
+    ): void {
+        $connect = $objectManager->get(ResourceConnection::class)->getConnection();
+        $output->writeln("<info>Optimize tables</info>");
+        foreach ($connect->getTables() as $tableName) {
+            $connect->query("OPTIMIZE TABLE `$tableName`");
+        }
+    }
 }