Merge branch '2.4-develop' of github.com:magento-gl/magento2ce into AC-16072-SalesRule-Order

Author: shashi011

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

@@ -43,4 +43,6 @@ AdminSetQuantityToEachSkusConfigurableProductActionGroup
 SelectStorefrontSideBarAttributeOption
 AdminAddProductVideoWithPreviewActionGroup
 AdminSetBaseCurrencyActionGroup
-AdminSetDefaultCurrencyActionGroup
+AdminSetDefaultCurrencyActionGroup
+ChangeConfigurableProductChildProductPriceActionGroup
+SaveConfigurableProductAddToCurrentAttributeSetActionGroup

app/code/Magento/Catalog/Test/Mftf/test-dependency-allowlist

@@ -135,10 +135,11 @@
         <waitForElementVisible selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="waitVisiblePrint"/>
         <seeElement selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="seeVisiblePrint2"/>
 
-        <!-- See print page -->
-        <click selector="{{CheckoutSuccessMainSection.printLink}}" stepKey="clickPrintLink"/>
-        <waitForPageLoad stepKey="waitForPrintOrderPageLoad"/>
-        <seeElement selector="{{StorefrontCustomerOrderViewSection.orderTitle}}" stepKey="seeOrderTitleOnPrint"/>
-        <switchToWindow stepKey="switchToWindow2"/>
+        <!-- Validate print page URL -->
+        <grabAttributeFrom selector="{{CheckoutSuccessMainSection.printLink}}" userInput="href" stepKey="orderIdFromPrintUrl"/>
+        <assertRegExp message="Assert print order url has correct format" stepKey="assertPrintUrlHasCorrectFormat">
+            <expectedResult type="string">/^.+\/sales\/order\/print\/order_id\/\d+\/$/</expectedResult>
+            <actualResult type="variable">orderIdFromPrintUrl</actualResult>
+        </assertRegExp>
     </test>
 </tests>

app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml

@@ -15,6 +15,7 @@
 
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_duplicatedCMSPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
+        <waitForElementVisible selector="{{CmsNewPagePageContentSection.contentHeading}}" stepKey="waitForContentHeading"/>
         <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{_duplicatedCMSPage.content_heading}}" stepKey="fillFieldContentHeading"/>
         <scrollTo selector="{{CmsNewPagePageContentSection.content}}" stepKey="scrollToPageContent"/>
         <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{_duplicatedCMSPage.content}}" stepKey="fillFieldContent"/>

app/code/Magento/Cms/Test/Mftf/ActionGroup/FillOutCMSPageContentActionGroup.xml

@@ -124,6 +124,7 @@ public function execute()
 
                 $this->addErrorMessages($resultBlock, $errorAggregator);
                 $resultBlock->addSuccess(__('Import successfully done'));
+                $this->_eventManager->dispatch('log_admin_import');
             }
 
             return $resultLayout;

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithChineseLocaleTest.xml

@@ -51,6 +51,7 @@ public function execute()
             $import = $this->getImport()->setData($data);
             try {
                 $source = $import->uploadFileAndGetSource();
+                $this->_eventManager->dispatch('log_admin_import');
                 $this->processValidationResult($import->validateSource($source), $resultBlock);
                 $ids = $import->getValidatedIds();
                 if (count($ids) > 0) {

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php

@@ -27,6 +27,7 @@
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\AbstractSource;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -83,6 +84,11 @@ class ValidateTest extends TestCase
      */
     private $abstractSourceMock;
 
+    /**
+     * @var EventManagerInterface|MockObject
+     */
+    private $eventManagerMock;
+
     protected function setUp(): void
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -147,6 +153,13 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $this->eventManagerMock = $this->getMockBuilder(EventManagerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->contextMock->expects($this->any())
+            ->method('getEventManager')
+            ->willReturn($this->eventManagerMock);
+
         $this->validate = new Validate(
             $this->contextMock,
             $this->reportProcessorMock,
@@ -337,6 +350,10 @@ public function testFileVerifiedWithImport()
             ->method('getAllErrors')
             ->willReturn($errorAggregatorMock);
 
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('log_admin_import');
+
         $this->resultFactoryMock->expects($this->any())
             ->method('create')
             ->with(ResultFactory::TYPE_LAYOUT)

app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php

@@ -34,8 +34,13 @@
             </createData>
         </before>
         <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <!-- Logout customer first -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+            <!-- Delete via Admin UI instead of API -->
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="$$createCustomer.email$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteProduct" />
             <!-- Delete Cart Price Rule -->
             <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php

@@ -53,9 +53,13 @@
         <after>
             <magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
             <magentoCLI command="config:set {{StorefrontPaypalExpressAuthorizationPaymentActionOptionConfigData.path}} {{StorefrontPaypalExpressAuthorizationPaymentActionOptionConfigData.value}}" stepKey="setPaymentAction"/>
+            <!-- Logout customer first -->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
-            <actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteCustomer"/>
-            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteProduct"/>
+            <!-- Delete via Admin UI instead of API -->
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="$$createCustomer.email$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteProduct" />
             <!--Delete cart price rule-->
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
                 <argument name="ruleName" value="{{_defaultCoupon.code}}"/>