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

Author: veloraven

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

@@ -22,31 +22,29 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
-
-            <!-- Cleanup Paypal configurations -->
-
             <!-- Log out Admin -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 
+        <!-- Open PayPal Advanced->Frontend Experience->Features configuration -->
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage1"/>
         <actionGroup ref="AdminOpenPayPalAdvancedFrontendExperienceFeaturesPageActionGroup" stepKey= "openFeaturesPage1"/>
-        <see selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmo"/>
-        <actionGroup ref="AdminSelectDisableFundingActionGroup" stepKey="selectVenmo"/>
+        <!-- Venmo option is present in Disable Funding Options multiselect -->
+        <see selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmoOption"/>
+        <!-- Select Venmo option in Disable Funding Options multiselect and save config -->
+        <actionGroup ref="AdminSelectDisableFundingActionGroup" stepKey="selectVenmoOption"/>
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
-        <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
-
 
+        <!-- Open PayPal Advanced->Frontend Experience->Features configuration page again -->
         <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage2"/>
         <actionGroup ref="AdminOpenPayPalAdvancedFrontendExperienceFeaturesPageActionGroup" stepKey="openFeaturesPage2"/>
-        <see selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmo2"/>
+        <!-- Check Venmo option is selected  -->
         <seeOptionIsSelected selector="{{PayPalAdvancedFrontendExperienceFeaturesSection.disableFundingOptionsMultiselect('us')}}" userInput="Venmo" stepKey="seeVenmoIsSelected"/>
-
-        <actionGroup ref="AdminUnselectDisableFundingActionGroup" stepKey="unselectVenmo"/>
+        <!-- Unselect Venmo option in Disable Funding Options multiselect and save config -->
+        <actionGroup ref="AdminUnselectDisableFundingActionGroup" stepKey="unselectVenmoOption"/>
         <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
-        <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
 
     </test>
 </tests>

app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php

@@ -144,6 +144,7 @@ private function getDisallowedFundingMap()
     {
         return [
             "CREDIT" => 'credit',
+            "VENMO" => 'venmo',
             "CARD" => 'card',
             "ELV" => 'sepa'
         ];

app/code/Magento/Paypal/Test/Unit/Model/_files/expected_url_config.php

@@ -214,4 +214,41 @@ function generateExpectedPaypalSdkUrl(array $params) : String
             )
         ]
     ],
+    'venmo_disabled' => [
+        'en_US',
+        'Authorization',
+        'CREDIT,VENMO,ELV,CARD',
+        false,
+        true,
+        [
+            'sdkUrl' => generateExpectedPaypalSdkUrl(
+                [
+                    'client-id' => 'sb',
+                    'locale' => 'en_US',
+                    'currency' => 'USD',
+                    'enable-funding' => implode(',', ['venmo', 'paylater']),
+                    'commit' => 'false',
+                    'intent' => 'authorize',
+                    'merchant-id' => 'merchant',
+                    'disable-funding' => implode(
+                        ',',
+                        [
+                            'credit',
+                            'venmo',
+                            'sepa',
+                            'card',
+                            'bancontact',
+                            'eps',
+                            'giropay',
+                            'ideal',
+                            'mybank',
+                            'p24',
+                            'sofort'
+                        ]
+                    ),
+                    'components' => implode(',', ['messages', 'buttons']),
+                ]
+            )
+        ]
+    ],
 ];