MC-41572: Invalid Captcha when using Paypal PayflowPro

Author: victor-v-rad

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

@@ -14,7 +14,6 @@
         </annotations>
         <arguments>
             <argument name="Category"/>
-            <argument name="PayPalPaymentMethod" type="string" defaultValue="{{CheckoutPaymentSection.PayPalPaymentRadio}}"/>
         </arguments>
 
         <amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
@@ -31,6 +30,6 @@
         <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPlaceOrderButton"/>
-        <click selector="{{PayPalPaymentMethod}}" stepKey="clickPayPalCheckbox"/>
+        <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="clickPayPalCheckbox"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/PaypalCaptcha/Test/Mftf/ActionGroup/AddProductToCheckoutPageWithPayPalPayflowProActionGroup.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AddProductToCheckoutPageWithPayPalPayflowProActionGroup" extends="AddProductToCheckoutPageActionGroup">
+        <annotations>
+            <description>Extends AddProductToCheckoutPageActionGroup to choose PayPal PayflowPro method</description>
+        </annotations>
+        <arguments>
+        </arguments>
+        <click selector="{{StorefrontPaypalCheckoutSection.creditCard}}" stepKey="clickPayPalCheckbox"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/PaypalCaptcha/Test/Mftf/Test/StorefrontPaymentsCaptchaWithPayflowProTest.xml

@@ -70,9 +70,8 @@
         </actionGroup>
 
         <!-- Add product to cart and proceed to checkout payments method step -->
-        <actionGroup ref="AddProductToCheckoutPageActionGroup" stepKey="goToCheckoutPaypalPayflowPro">
+        <actionGroup ref="AddProductToCheckoutPageWithPayPalPayflowProActionGroup" stepKey="goToCheckoutPaypalPayflowPro">
             <argument name="Category" value="$createCategory$"/>
-            <argument name="PayPalPaymentMethod" value="{{StorefrontPaypalCheckoutSection.creditCard}}"/>
         </actionGroup>
 
         <!-- Fill credit card form with card number, expiration and CVV  -->