MAGETWO-95483: Can't delete a cart entry when the cart has a shipping address

- Added test assertion for bugfix

Author: nathanjosiah

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

@@ -27,11 +27,10 @@ public function afterRemoveItem(Quote $quote, Quote $result, $itemId): Quote
         if (empty($result->getAllVisibleItems())) {
             foreach ($result->getAllAddresses() as $address) {
                 $result->removeAddress($address->getId());
-
-                $extensionAttributes = $result->getExtensionAttributes();
-                if (!$result->isVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
-                    $extensionAttributes->setShippingAssignments([]);
-                }
+            }
+            $extensionAttributes = $result->getExtensionAttributes();
+            if (!$result->isVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+                $extensionAttributes->setShippingAssignments([]);
             }
         }
 

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');