MC-15140: Paypal Express Checkout - When user hits Cancel button on pop-up "There is already another PayPal solution enabled...." then "Enable this Solution" drop down still says "Yes" instead of "No"

Author: VeronikaYarats

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

@@ -28,13 +28,20 @@
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
     </actionGroup>
-    <actionGroup name="EnablePayPalSolution" extends="EnablePayPalConfiguration">
-        <remove keyForRemoval="waitForOtherPayPalPaymentsSection"/>
-        <remove keyForRemoval="clickOtherPayPalPaymentsSection"/>
-        <remove keyForRemoval="seeAlertMessage"/>
-        <remove keyForRemoval="acceptEnablePopUp"/>
-        <remove keyForRemoval="saveConfig"/>
-        <remove keyForRemoval="waitForPageLoad2"/>
+    <actionGroup name="EnablePayPalSolution" >
+        <annotations>
+            <description>Expands the 'OTHER PAYPAL PAYMENT SOLUTIONS' tab on the Admin Configuration page. Enables the provided PayPal Config type for the provided Country Code.</description>
+        </annotations>
+        <arguments>
+            <argument name="payPalConfigType"/>
+            <argument name="countryCode" type="string" defaultValue="us"/>
+        </arguments>
+        <waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
+        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
+        <waitForElementVisible selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="waitForWPSExpressConfigureBtn"/>
+        <click selector="{{payPalConfigType.configureBtn(countryCode)}}" stepKey="clickWPSExpressConfigureBtn"/>
+        <waitForElementVisible selector="{{payPalConfigType.enableSolution(countryCode)}}" stepKey="waitForWPSExpressEnable"/>
+        <selectOption selector="{{payPalConfigType.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableWPSExpressSolution"/>
     </actionGroup>
     <actionGroup name="CheckEnableOptionPayPalConfiguration">
         <annotations>

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

@@ -39,8 +39,6 @@
         <!--Try to enable express checkout Solution-->
         <comment userInput="Try to enable express checkout Solution" stepKey="commentTryEnableExpressCheckout"/>
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab('us')}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab('us')}}" visible="false" stepKey="clickOtherPayPalPaymentsSection"/>
         <actionGroup ref="EnablePayPalSolution" stepKey="enableExpressCheckout">
             <argument name="payPalConfigType" value="WPSExpressConfigSection"/>
             <argument name="countryCode" value="us"/>