ACQE-6571:Check config for PayPal Credit in Unites States For Paymentspro

Correction On AdminConfigPaymentsProInUnitedstatesTest

Author: subratpandit

app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminAssertPaypalCreditPaymentsProActionGroup.xml

@@ -31,7 +31,5 @@
         <waitForElementNotVisible selector ="{{AdminConfigPaymentsProPaypalCreditSection.paypalSolution(countryCode)}}" stepKey="assertEnabledSolutions"/>
         <waitForElementNotVisible selector ="{{AdminConfigPaymentsProPaypalCreditSection.paypalCredit(countryCode)}}" stepKey="enablePaypalCredit"/>
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/>
-        <magentoCLI command="indexer:reindex" stepKey="performReindex"/>
-        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigForPaymentsProPaypalCreditActionGroup.xml renamed to app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminClearForPaymentsProPaypalCreditActionGroup.xml

@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminConfigForPaymentsProPaypalCreditActionGroup">
+    <actionGroup name="AdminClearForPaymentsProPaypalCreditActionGroup">
         <annotations>
             <description>Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.</description>
         </annotations>
@@ -22,8 +22,8 @@
         <waitForElementVisible selector="{{AdminConfigPaymentsProPaypalCreditSection.otherPaypalLink(countryCode)}}" stepKey="assertPayinAllLink"/>
         <waitForElementVisible selector="{{AdminConfigPaymentsProPaypalCreditSection.paypalPaymentGatewayLink(countryCode)}}" stepKey="assertPaypalPaymentGateway"/>
         <scrollTo selector="{{AdminConfigPaymentsProPaypalCreditSection.otherPaypalLink(countryCode)}}" stepKey="scrollPayinAll"/>
-        <waitForElementClickable selector="{{AdminConfigPaymentsProPaypalCreditSection.paymentsPro(countryCode)}}" stepKey="waitForPaymentProToBeClickable"/>
-        <click selector="{{AdminConfigPaymentsProPaypalCreditSection.paymentsPro(countryCode)}}" stepKey="clickPaymentPro"/>
+        <waitForElementClickable selector="{{PayPalPaymentsProConfigSection.configureBtn(countryCode)}}" stepKey="waitForPaymentProToBeClickable"/>
+        <click selector="{{PayPalPaymentsProConfigSection.configureBtn(countryCode)}}" stepKey="clickPaymentPro"/>
         <waitForPageLoad stepKey="waitForPaymethodConfigPageLoad"/>
         <clearField selector="{{PayPalPaymentsProConfigSection.partner(countryCode)}}" stepKey="clearInputPartnerField"/>
         <clearField selector="{{PayPalPaymentsProConfigSection.vendor(countryCode)}}" stepKey="clearInputVendorField"/>

app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminClearPaymentsProActionGroup.xml

@@ -9,9 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminConfigPaymentsProPaypalCreditSection">
-        <element name="paymentsPro" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wpp_usuk-head" parameterized="true"/>
-        <element name="configureBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wpp_usuk-head" parameterized="true"/>
-        <element name="enableSolution" type="select" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_paypal_payflow" parameterized="true"/>
         <element name="otherPaypalLink" type="input" selector="//*[contains(@id, 'payment_{{countryCode}}_paypal_group_all_in_one-head')]" parameterized="true" />
         <element name="paypalPaymentGatewayLink" type="button" selector="//*[contains(@id, 'payment_{{countryCode}}_paypal_payment_gateways-head')]" parameterized="true" />
         <element name="enablePaypalCredit" type="select" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_enable_express_checkout_bml_payflow" parameterized="true"/>

app/code/Magento/Paypal/Test/Mftf/Section/AdminConfigPaymentsProPaypalCreditSection.xml

@@ -34,9 +34,15 @@
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
         </after>
         <!--Admin navigate to payment configuration page and assert no other paypal payment is enabled-->
-        <actionGroup ref="AdminConfigForPaymentsProPaypalCreditActionGroup" stepKey="configPaymentsPro"/>
+        <actionGroup ref="AdminClearForPaymentsProPaypalCreditActionGroup" stepKey="configPaymentsPro"/>
         <!--Enable Payment Pro and Paypal Credit-->
         <actionGroup ref="AdminAssertPaypalCreditPaymentsProActionGroup" stepKey="enablePaymentsPro"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="performCleanCache">
+            <argument name="tags" value="config full_page"/>
+        </actionGroup>
         <!--Login to storefront as guest customer-->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
         <waitForPageLoad stepKey="waitForProductPage"/>