Merge branch '2.4-develop' into spartans_pr_21042025

Author: magento-devops-queue-mgr-svc

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -122,6 +122,9 @@
         <actionGroup ref="AdminOpenReviewByUserNicknameActionGroup" stepKey="openFirstCustomerReviews"/>
         <actionGroup ref="AdminChangeReviewStatusActionGroup" stepKey="changeFirstReviewStatus"/>
         <actionGroup ref="AdminSaveReviewActionGroup" stepKey="saveModeratedFirstReview"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
+          <argument name="tags" value="config"/>
+        </actionGroup>
 
         <!-- Moderate second product reviews: change review status from pending to approved, save -->
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>

app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright 2018 Adobe
+   * Copyright 2025 Adobe
   * All Rights Reserved.
   */
 -->
@@ -17,6 +17,8 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-27571"/>
             <group value="persistent"/>
+            <!-- added pr_exclude group as this test failing repeatedly and will be fixed and removed in this ACQE-7751 -->
+            <group value="pr_exclude"/>
         </annotations>
         <before>
 

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUsedInFilterTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2024 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -75,7 +75,9 @@
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
         <actionGroup ref="AdminOpenMediaGalleryTinyMceActionGroup" stepKey="openMediaGalleryFromWysiwygToFilterIMage"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
-
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+            <argument name="tags" value="config full_page"/>
+        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminMediaGalleryApplyUsedInFilterActionGroup" stepKey="applyUsedInCategoryFilter">
             <argument name="entityType" value="Categories"/>

app/code/Magento/Paypal/Test/Mftf/Test/AdminCancelPaypalExpressCheckoutTest.xml

@@ -16,6 +16,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="AC-6116"/>
             <group value="3rd_party_integration"/>
+            <group value="paypal"/>
             <group value="pr_exclude"/>
         </annotations>
         <before>
@@ -57,6 +58,7 @@
         <!-- Login to Paypal in-context-->
         <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
         <actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterPayment"/>
         <actionGroup ref="StorefrontPlaceOrderOnOrderReviewPageActionGroup" stepKey="clickPlaceOrderBtn"/>
         <!-- I see order successful Page -->
         <waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>

app/code/Magento/Paypal/Test/Mftf/Test/AdminCheckConfigurationForPayPalExpressCheckoutInUnitesStatesTest.xml

@@ -48,7 +48,9 @@
         <actionGroup ref="AdminOpenPayPalAdvancedFrontendExperienceFeaturesPageActionGroup" stepKey= "openFeatures"/>
         <dontSeeOptionIsSelected selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="PayPal Credit" stepKey="dontSeePayPalCreditOptionIsSelected" />
         <!--Enable paypal solution-->
-        <actionGroup ref="AdminAssertEnableThisSolutionAndInContextCheckoutValueActionGroup" stepKey= "adminConfigPaypalExpressCheckout"/>
+        <actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="adminConfigPaypalExpressCheckout">
+            <argument name="credentials" value="SamplePaypalExpressConfig2"/>
+        </actionGroup>
         <!--Go to storefront and add product to cart -->
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="goToProductOnStorefront">
             <argument name="product" value="$$simpleProduct$$"/>