merge magento/2.4-develop into magento-tsg/2.4-develop-pr67

Author: magento-mts-svc

app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php

@@ -31,6 +31,7 @@ public function execute()
                     ->unsLastSuccessQuoteId()
                     ->unsLastOrderId()
                     ->unsLastRealOrderId();
+                $this->_getSession()->unsQuoteId(); // clean quote from session that was set in OnAuthorization
                 $this->messageManager->addSuccessMessage(
                     __('Express Checkout and Order have been canceled.')
                 );

app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php

@@ -11,7 +11,7 @@
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 
 /**
- * Class PlaceOrder
+ * Creates order on backend and prepares session to show appropriate next step in flow
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress
@@ -127,6 +127,7 @@ public function execute()
                 return;
             }
             $this->_initToken(false); // no need in token anymore
+            $this->_getSession()->unsQuoteId(); // clean quote from session that was set in OnAuthorization
             $this->_redirect('checkout/onepage/success');
             return;
         } catch (ApiProcessableException $e) {

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

@@ -16,6 +16,8 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <seeCurrentUrlMatches regex="~\//www.sandbox.paypal.com/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
         <conditionalClick selector="{{PayPalPaymentSection.notYouLink}}" dependentSelector="{{PayPalPaymentSection.notYouLink}}" visible="true" stepKey="selectNotYouSection"/>
+        <conditionalClick selector="{{PayPalPaymentSection.existingAccountLoginBtn}}" dependentSelector="{{PayPalPaymentSection.existingAccountLoginBtn}}" visible="true" stepKey="skipAccountCreationAndLogin"/>
+        <waitForPageLoad stepKey="waitForLoginPageLoad"/>
         <waitForElement selector="{{PayPalPaymentSection.email}}" stepKey="waitForLoginForm" />
         <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{credentials.magento/paypal_sandbox_login_email}}" stepKey="fillEmail"/>
         <click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>

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

@@ -10,6 +10,7 @@
     <section name="PayPalPaymentSection">
         <element name="guestCheckout" type="input" selector="#guest"/>
         <element name="loginSection" type="input" selector=" #main&gt;#login"/>
+        <element name="existingAccountLoginBtn" type="input" selector="#loginSection a"/>
         <element name="email" type="input" selector="//input[contains(@name, 'email') and not(contains(@style, 'display:none'))]"/>
         <element name="password" type="input" selector="//input[contains(@name, 'password') and not(contains(@style, 'display:none'))]"/>
         <element name="loginBtn" type="input" selector="button#btnLogin"/>

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

@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
-            <skip>
-                <issueId value="MC-35722"/>
-            </skip>
         </annotations>
         <before>
             <!-- Login -->

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

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
-            <skip>
-                <issueId value="MC-35722"/>
-            </skip>
         </annotations>
         <before>
             <!--Set price scope global-->

dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\Setup\Model;
 
+use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Setup\Validator\DbValidator;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+
 class ConfigOptionsListCollectorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -14,7 +18,7 @@ class ConfigOptionsListCollectorTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        $this->objectManagerProvider = $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class);
+        $this->objectManagerProvider = $this->createMock(ObjectManagerProvider::class);
         $this->objectManagerProvider
             ->expects($this->any())
             ->method('get')
@@ -24,11 +28,13 @@ protected function setUp(): void
     public function testCollectOptionsLists()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $fullModuleListMock = $this->createMock(\Magento\Framework\Module\FullModuleList::class);
-        $fullModuleListMock->expects($this->once())->method('getNames')->willReturn(['Magento_Backend']);
+        $componentRegistrar = $this->createMock(ComponentRegistrarInterface::class);
+        $componentRegistrar->expects($this->once())
+            ->method('getPaths')
+            ->willReturn(['Magento_Backend'=>'app/code/Magento/Backend']);
 
-        $dbValidator = $this->createMock(\Magento\Setup\Validator\DbValidator::class);
-        $configGenerator = $this->createMock(\Magento\Setup\Model\ConfigGenerator::class);
+        $dbValidator = $this->createMock(DbValidator::class);
+        $configGenerator = $this->createMock(ConfigGenerator::class);
 
         $setupOptions = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(
@@ -39,7 +45,7 @@ public function testCollectOptionsLists()
                 ]
             );
 
-        $serviceLocator = $this->getMockForAbstractClass(\Laminas\ServiceManager\ServiceLocatorInterface::class);
+        $serviceLocator = $this->getMockForAbstractClass(ServiceLocatorInterface::class);
 
         $serviceLocator->expects($this->once())
             ->method('get')
@@ -51,7 +57,7 @@ public function testCollectOptionsLists()
             \Magento\Setup\Model\ConfigOptionsListCollector::class,
             [
                 'objectManagerProvider' => $this->objectManagerProvider,
-                'fullModuleList' => $fullModuleListMock,
+                'componentRegistrar' => $componentRegistrar,
                 'serviceLocator' => $serviceLocator
             ]
         );