Merge remote-tracking branch 'trigger/MAGETWO-95483' into BugFixPR

Author: joanhe

app/code/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddresses.php

@@ -15,10 +15,11 @@
 class ResetQuoteAddresses
 {
     /**
+     * Clears the quote addresses when all the items are removed from the cart
+     *
      * @param Quote $quote
      * @param Quote $result
      * @param mixed $itemId
-     *
      * @return Quote
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -28,6 +29,10 @@ public function afterRemoveItem(Quote $quote, Quote $result, $itemId): Quote
             foreach ($result->getAllAddresses() as $address) {
                 $result->removeAddress($address->getId());
             }
+            $extensionAttributes = $result->getExtensionAttributes();
+            if (!$result->isVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+                $extensionAttributes->setShippingAssignments([]);
+            }
         }
 
         return $result;

dev/tests/integration/testsuite/Magento/Checkout/Plugin/Model/Quote/ResetQuoteAddressesTest.php

@@ -52,9 +52,15 @@ public function testAfterRemoveItem(): void
         $cart = Bootstrap::getObjectManager()->create(Cart::class);
 
         $activeQuote = $cart->getQuote();
+        // Dummy data is still persisted here. This is sufficient to check that it is removed
+        $activeQuote->getExtensionAttributes()->setShippingAssignments(['test']);
+
         $cart->removeItem($activeQuote->getAllVisibleItems()[0]->getId());
         $cart->save();
 
+        // Check that the shipping assignments were also unset
+        $this->assertEmpty($activeQuote->getExtensionAttributes()->getShippingAssignments());
+
         /** @var Quote $quote */
         $quote = Bootstrap::getObjectManager()->create(Quote::class);
         $quote->load('test_order_with_virtual_product', 'reserved_order_id');