Merge branch '2.4-develop' into spartans_pr_17102025_AC-15856

Author: sumesh-GL

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

@@ -32,6 +32,8 @@
             <actionGroup ref="SetAdminAccountActionGroup" stepKey="setAdminAccountToUnitedStates">
                 <argument name="InterfaceLocaleByValue" value="en_US" />
             </actionGroup>
+            <!--Delete customer created during test execution-->
+            <actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomerFromGrid"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
@@ -40,35 +42,29 @@
                 <argument name="tags" value=""/>
             </actionGroup>
         </after>
-
         <!-- Open Admin Store Configuration Page -->
         <actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
-
         <!--"Choose United Kingdom" as State Option Required and save configuration -->
         <conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab"/>
         <waitForAjaxLoad stepKey="waitForAjax"/>
         <scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
         <selectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" userInput="United Kingdom" stepKey="selectCountriesWithRequiredRegion"/>
         <click selector="#save" stepKey="saveStateOptionsConfig"/>
         <waitForPageLoad stepKey="waitForSavingConfig"/>
-
         <!-- create customer on storefront -->
         <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
         <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
         <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
             <argument name="customer" value="Simple_US_Customer"/>
         </actionGroup>
         <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
-
         <!-- Open AddressBook and set Country as "United Kingdom" -->
         <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBookPage">
             <argument name="menu" value="Address Book"/>
         </actionGroup>
-
         <!-- Choose Country as "United Kingdom" -->
         <selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="United Kingdom" stepKey="selectCountry"/>
         <click selector="{{StorefrontCustomerAddressFormSection.saveAddress}}" stepKey="saveCustomerAddress"/>
-
         <!-- Assert the error message -->
         <seeElement selector="{{StorefrontCustomerMessagesSection.assertErrorMessage}}" stepKey="assetErrorMessage"/>
     </test>

app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml

@@ -31,6 +31,12 @@
             </actionGroup>
         </before>
         <after>
+            <!--Delete customer created during test execution-->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomerFromGrid">
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
             <!-- Set default configuration. -->
             <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms"/>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAfterFailConfigData.path}} {{StorefrontCustomerCaptchaModeAfterFailConfigData.value}}" stepKey="defaultCaptchaMode" />
@@ -40,28 +46,21 @@
                 <argument name="tags" value="config full_page"/>
             </actionGroup>
         </after>
-
         <!-- Open Customer registration page -->
         <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="goToCustomerAccountCreatePage" />
-
         <!-- Check captcha visibility registration page load -->
         <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup" stepKey="verifyCaptchaVisible" />
-
         <!-- Submit form with incorrect captcha -->
         <actionGroup ref="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" stepKey="fillNewCustomerAccountFormWithIncorrectCaptcha">
             <argument name="customer" value="Simple_US_Customer" />
             <argument name="captcha" value="{{WrongCaptcha.value}}" />
         </actionGroup>
-
         <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="clickCreateAnAccountButton" />
-
         <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="assertMessage">
             <argument name="message" value="Incorrect CAPTCHA" />
             <argument name="messageType" value="error" />
         </actionGroup>
-
         <actionGroup ref="AssertCaptchaVisibleOnCustomerAccountCreatePageActionGroup" stepKey="verifyCaptchaVisibleAfterFail" />
-
         <!-- Submit form with correct captcha -->
         <actionGroup ref="StorefrontFillCustomerAccountCreationFormWithCaptchaActionGroup" stepKey="fillNewCustomerAccountFormWithCorrectCaptcha">
             <argument name="customer" value="Simple_US_Customer" />

app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

@@ -330,4 +330,7 @@
         <data key="url_path">catalog/seo/category_url_suffix</data>
         <data key="url_suffix">.html</data>
     </entity>
+    <entity name="ImportCategoryFromCSV" type="category">
+        <data key="name">simpleCategory5d53a993b7ccb2</data>
+    </entity>
 </entities>

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

@@ -24,6 +24,12 @@
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
         </before>
         <after>
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteSimpleSubCategory">
+                <argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteFirstLevelSubCategory">
+                <argument name="categoryName" value="{{FirstLevelSubCat.name}}"/>
+            </actionGroup>
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
             <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

@@ -33,11 +33,8 @@
             </createData>
         </before>
         <after>
-            <deleteData createDataKey="createProductA" stepKey="deleteProductA"/>
-            <deleteData createDataKey="createProductB" stepKey="deleteProductB"/>
-            <deleteData createDataKey="createProductC" stepKey="deleteProductC"/>
-            <deleteData createDataKey="createProductD" stepKey="deleteProductD"/>
-            <deleteData createDataKey="createProductE" stepKey="deleteProductE"/>
+            <!-- Delete all products via API -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="createCategoryA" stepKey="deleteCategoryA"/>
         </after>
 

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

@@ -26,6 +26,10 @@
             <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
             <actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="resetProductFilters"/>
+            <!--Clean up categories-->
+            <actionGroup ref="DeleteCategoryActionGroup" stepKey="cleanSimpleSubCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <magentoCLI command="config:set checkout/options/enable_guest_checkout_login 0" stepKey="DisablingGuestCheckoutLogin"/>
         </after>
@@ -253,11 +257,6 @@
         </actionGroup>
 
         <!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
-        <!--Clean up categories-->
-        <comment userInput="Clean up categories" stepKey="cleanupCategoriesComment"/>
-        <actionGroup ref="DeleteCategoryActionGroup" stepKey="cleanSimpleSubCategory">
-            <argument name="categoryEntity" value="SimpleSubCategory"/>
-        </actionGroup>
         <!--Clean up products-->
         <comment userInput="Clean up simple product" stepKey="cleanUpSimpleProduct"/>
         <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteSimpleProduct">

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

@@ -20,7 +20,6 @@
             <group value="checkout"/>
             <group value="cloud"/>
         </annotations>
-
         <before>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -29,14 +28,16 @@
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
-
         <after>
+            <!--Delete customer created during test execution-->
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomerFromGrid">
+                <argument name="customerEmail" value="CustomerEntityOne.email"/>
+            </actionGroup>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
-
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
             <argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
         </actionGroup>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml

@@ -34,6 +34,7 @@
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="simpleuscustomer" stepKey="deleteCustomer"/>
             <magentoCLI command="config:set payment/checkmo/allowspecific 0" stepKey="allowSpecificValue"/>
             <magentoCLI command="config:set payment/checkmo/specificcountry ''" stepKey="specificCountryValue"/>
             <magentoCLI command="config:set checkout/options/display_billing_address_on 0" stepKey="setDisplayBillingAddressOnPaymentMethod"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/StorefrontAssertSeveralTermsAndConditionsOnPayPalExpressCheckoutReviewPageTest.xml

@@ -29,6 +29,7 @@
         <after>
             <!--Delete created data-->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
             <actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
             <actionGroup ref="AdminDisableTermsAndConditionsConfigurationActionGroup" stepKey="disableTermsAndConditions"/>

app/code/Magento/CheckoutAgreements/Test/Mftf/Test/StorefrontAssertSeveralTermsAndConditionsOnPayPalPayFlowProCheckoutReviewPageTest.xml

@@ -47,6 +47,7 @@
         <after>
             <!--Delete created data-->
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>
             <actionGroup ref="AdminDeleteAllTermConditionsActionGroup" stepKey="deleteAllTerms"/>
             <actionGroup ref="AdminDisableTermsAndConditionsConfigurationActionGroup" stepKey="disableTermsAndConditions"/>