MC-37484: Cart query error when trying to switch store view

Author: cspruiell

app/code/Magento/Quote/Model/PaymentMethodManagement.php

@@ -83,7 +83,7 @@ public function set($cartId, \Magento\Quote\Api\Data\PaymentInterface $method)
             throw new InvalidTransitionException(__('The requested Payment Method is not available.'));
         }
 
-        $this->quoteRepository->save($quote);
+        $quote->save();
         return $quote->getPayment()->getId();
     }
 

app/code/Magento/Quote/Test/Unit/Model/PaymentMethodManagementTest.php

@@ -136,7 +136,7 @@ public function testSetVirtualProduct()
 
         $quoteMock = $this->getMockBuilder(Quote::class)
             ->addMethods(['setTotalsCollectedFlag'])
-            ->onlyMethods(['getPayment', 'isVirtual', 'getBillingAddress', 'collectTotals'])
+            ->onlyMethods(['getPayment', 'isVirtual', 'getBillingAddress', 'collectTotals', 'save'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
@@ -189,7 +189,7 @@ public function testSetVirtualProduct()
             ->willReturn(true);
 
         $quoteMock->expects($this->once())->method('setTotalsCollectedFlag')->with(false)->willReturnSelf();
-        $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
+        $quoteMock->expects($this->once())->method('save')->willReturnSelf();
 
         $paymentMock->expects($this->once())->method('getId')->willReturn($paymentId);
         $this->assertEquals($paymentId, $this->model->set($cartId, $methodMock));
@@ -267,7 +267,7 @@ public function testSetSimpleProduct()
 
         $quoteMock = $this->getMockBuilder(Quote::class)
             ->addMethods(['setTotalsCollectedFlag'])
-            ->onlyMethods(['getPayment', 'isVirtual', 'getShippingAddress', 'collectTotals'])
+            ->onlyMethods(['getPayment', 'isVirtual', 'getShippingAddress', 'collectTotals', 'save'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->quoteRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
@@ -324,7 +324,7 @@ public function testSetSimpleProduct()
             ->willReturn(true);
 
         $quoteMock->expects($this->once())->method('setTotalsCollectedFlag')->with(false)->willReturnSelf();
-        $this->quoteRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
+        $quoteMock->expects($this->once())->method('save')->willReturnSelf();
 
         $paymentMock->expects($this->once())->method('getId')->willReturn($paymentId);
         $this->assertEquals($paymentId, $this->model->set($cartId, $methodMock));