ACP2E-1303: Pay later payments showing on the storefront even disabled

Author: veloraven

app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalAdvancedFrontendExperienceFeaturesSection.xml

@@ -9,6 +9,5 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="PayPalAdvancedFrontendExperienceFeaturesSection">
         <element name="disableFundingOptionsMultiselect" type="multiselect" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_frontend_features_disable_funding_options"  parameterized="true"/>
-        <element name="disableFundingOptionsOption" type="multiselect" selector="//*[@value='{{option}}']" parameterized="true"/>
     </section>
 </sections>

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

@@ -11,7 +11,6 @@
     <test name="AdminTurnOffVenmoButtonTest">
         <annotations>
             <features value="Paypal"/>
-            <stories value="Button Configuration"/>
             <title value="Check that Admin can turn off Venmo button"/>
             <description value="Venmo button can be turned off by Admin"/>
             <severity value="AVERAGE"/>
@@ -20,62 +19,33 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
-
-            <!-- Create Product -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="_defaultProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-
-
         </before>
         <after>
 
             <!-- Cleanup Paypal configurations -->
 
-            <!-- Delete Product -->
-            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
-            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
-
             <!-- Log out Admin -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
+
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage1"/>
         <actionGroup ref="AdminOpenPayPalAdvancedFrontendExperienceFeaturesPageActionGroup" stepKey= "openFeaturesPage1"/>
-        <actionGroup ref="AdminSelectDisableFundingActionGroup" stepKey= "selectVenmo"/>
+        <see selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmo"/>
+        <actionGroup ref="AdminSelectDisableFundingActionGroup" stepKey="selectVenmo"/>
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
         <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
 
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage1">
-            <argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontSwitchToPayPalButtonIframeActionGroup" stepKey="switchToIframe1"/>
-
-        <dontSeeElement selector="{{StorefrontPayPalSmartButtonVenmoSection.venmoButton}}" stepKey="dontSeeVenmoButton"/>
-
-
 
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage2"/>
-        <actionGroup ref="AdminOpenPayPalAdvancedFrontendExperienceFeaturesPageActionGroup" stepKey= "openFeaturesPage2"/>
-        <actionGroup ref="AdminUnselectDisableFundingActionGroup" stepKey= "unselectVenmo"/>
+        <actionGroup ref="AdminOpenPayPalAdvancedFrontendExperienceFeaturesPageActionGroup" stepKey="openFeaturesPage2"/>
+        <see selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmo2"/>
+        <seeOptionIsSelected selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmoIsSelected"/>
+
+        <actionGroup ref="AdminUnselectDisableFundingActionGroup" stepKey="unselectVenmo"/>
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
         <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
 
-
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage2">
-            <argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontSwitchToPayPalButtonIframeActionGroup" stepKey="switchToIframe2"/>
-
-        <seeElement selector="{{StorefrontPayPalSmartButtonVenmoSection.venmoButton}}" stepKey="seeVenmoButton"/>
-
-
-<!--        <seeOptionIsSelected selector="{{ButtonCustomization.customizeDrpDown}}" userInput="No" stepKey="seeNoIsDefaultValue"/>
-        <selectOption selector="{{ButtonCustomization.customizeDrpDown}}" userInput="Yes" stepKey="enableButtonCustomization"/>
-        <pause stepKey="pause"/>
-
--->
     </test>
 </tests>