Merge remote-tracking branch 'origin/MC-33879' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php

@@ -10,7 +10,7 @@
 use Magento\Quote\Model\Quote;
 
 /**
- * Class ShippingMethodUpdater
+ * Class for updating shipping method in the quote.
  */
 class ShippingMethodUpdater extends AbstractHelper
 {
@@ -58,6 +58,12 @@ public function execute($shippingMethod, Quote $quote)
                 $this->disabledQuoteAddressValidation($quote);
 
                 $shippingAddress->setShippingMethod($shippingMethod);
+                $quoteExtensionAttributes = $quote->getExtensionAttributes();
+                if ($quoteExtensionAttributes && $quoteExtensionAttributes->getShippingAssignments()) {
+                    $quoteExtensionAttributes->getShippingAssignments()[0]
+                        ->getShipping()
+                        ->setMethod($shippingMethod);
+                }
                 $shippingAddress->setCollectShippingRates(true);
 
                 $quote->collectTotals();

app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php

@@ -16,7 +16,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @see \Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater
+ * Test shipping method updater
  */
 class ShippingMethodUpdaterTest extends TestCase
 {
@@ -39,11 +39,19 @@ class ShippingMethodUpdaterTest extends TestCase
      */
     private $shippingAddressMock;
 
+    /**
+     * @var Address|MockObject
+     */
+    private $billingAddressMock;
+
     /**
      * @var ShippingMethodUpdater
      */
     private $shippingMethodUpdater;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->configMock = $this->getMockBuilder(Config::class)
@@ -69,16 +77,24 @@ protected function setUp(): void
         );
     }
 
-    public function testExecuteException()
+    /**
+     * Test execute exception
+     *
+     * @return void
+     */
+    public function testExecuteException(): void
     {
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('The "shippingMethod" field does not exists.');
+        $this->expectExceptionMessage("The \"shippingMethod\" field does not exists.");
         $quoteMock = $this->getQuoteMock();
 
         $this->shippingMethodUpdater->execute('', $quoteMock);
     }
 
-    public function testExecute()
+    /**
+     * Test execute
+     */
+    public function testExecute(): void
     {
         $quoteMock = $this->getQuoteMock();
 
@@ -114,9 +130,13 @@ public function testExecute()
     }
 
     /**
+     * Disable quote address validation
+     *
      * @param MockObject $quoteMock
+     *
+     * @return void
      */
-    private function disabledQuoteAddressValidationStep(MockObject $quoteMock)
+    private function disabledQuoteAddressValidationStep(MockObject $quoteMock): void
     {
         $billingAddressMock = $this->getBillingAddressMock($quoteMock);
 
@@ -139,35 +159,42 @@ private function disabledQuoteAddressValidationStep(MockObject $quoteMock)
     }
 
     /**
+     * Get billing address mock object
+     *
      * @param MockObject $quoteMock
      * @return Address|MockObject
      */
-    private function getBillingAddressMock(MockObject $quoteMock)
+    private function getBillingAddressMock(MockObject $quoteMock): MockObject
     {
-        $billingAddressMock = $this->getMockBuilder(Address::class)
-            ->setMethods(['setShouldIgnoreValidation', 'getEmail', 'setSameAsBilling'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        if (!isset($this->billingAddressMock)) {
+            $this->billingAddressMock = $this->getMockBuilder(Address::class)
+                ->setMethods(['setShouldIgnoreValidation', 'getEmail', 'setSameAsBilling'])
+                ->disableOriginalConstructor()
+                ->getMock();
+        }
 
         $quoteMock->expects(self::any())
             ->method('getBillingAddress')
-            ->willReturn($billingAddressMock);
+            ->willReturn($this->billingAddressMock);
 
-        return $billingAddressMock;
+        return $this->billingAddressMock;
     }
 
     /**
+     * Get quote mock object
+     *
      * @return Quote|MockObject
      */
-    private function getQuoteMock()
+    private function getQuoteMock(): MockObject
     {
         return $this->getMockBuilder(Quote::class)
             ->setMethods(
                 [
                     'collectTotals',
                     'getBillingAddress',
                     'getShippingAddress',
-                    'getIsVirtual'
+                    'getIsVirtual',
+                    'getExtensionAttributes'
                 ]
             )->disableOriginalConstructor()
             ->getMock();

dev/tests/integration/testsuite/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdaterTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Model\Paypal\Helper;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test shipping method updater
+ */
+class ShippingMethodUpdaterTest extends TestCase
+{
+    /**
+     * @var ShippingMethodUpdater
+     */
+    private $shippingMethodUpdater;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->shippingMethodUpdater = $this->objectManager->get(ShippingMethodUpdater::class);
+    }
+
+    /**
+     * Tests that shipping method is actually updated in quote.
+     *
+     * @return void
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store carriers/flatrate/active 1
+     * @magentoConfigFixture default_store carriers/freeshipping/active 1
+     * @magentoDataFixture Magento/Braintree/Fixtures/paypal_quote.php
+     */
+    public function testExecute(): void
+    {
+        $reservedOrderId = 'test01';
+        /** @var Quote $quote */
+        $quote = $this->getQuote($reservedOrderId);
+
+        $this->assertEquals(
+            'flatrate_flatrate',
+            $quote->getShippingAddress()->getShippingMethod()
+        );
+
+        $this->shippingMethodUpdater->execute('freeshipping_freeshipping', $quote);
+
+        $this->assertEquals(
+            'freeshipping_freeshipping',
+            $quote->getShippingAddress()->getShippingMethod()
+        );
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return CartInterface
+     */
+    private function getQuote(string $reservedOrderId): CartInterface
+    {
+        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}