MAGETWO-37464: Merge and Fix Builds

 - fix merge conflicts

Author: Cari Spruiell

app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php

@@ -81,11 +81,8 @@ public function placeOrder($cartId)
     {
         /** @var $quoteIdMask QuoteIdMask */
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
-<<<<<<< .merge_file_PPOyn2
+        $this->cartRepository->get($quoteIdMask->getQuoteId())
+            ->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
         return $this->quoteManagement->placeOrder($quoteIdMask->getQuoteId());
-=======
-        $this->cartRepository->get($quoteIdMask->getId())->setCheckoutMethod(CartManagementInterface::METHOD_GUEST);
-        return $this->quoteManagement->placeOrder($quoteIdMask->getId());
->>>>>>> .merge_file_x9jgp1
     }
 }

app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php

@@ -29,6 +29,16 @@ class GuestCartManagementTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteIdMaskMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cartRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $quoteMock;
+
     /**
      * @var \Magento\Quote\Model\GuestCart\GuestCartManagement
      */
@@ -62,11 +72,30 @@ protected function setUp()
             false
         );
 
+        $this->cartRepositoryMock = $this->getMock(
+            'Magento\Quote\Api\CartRepositoryInterface',
+            ['get', 'getList'],
+            [],
+            '',
+            false
+        );
+
+        $this->quoteMock = $this->getMockForAbstractClass(
+            'Magento\Quote\Api\Data\CartInterface',
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['setCheckoutMethod']
+        );
+
         $this->guestCartManagement = $objectManager->getObject(
             'Magento\Quote\Model\GuestCart\GuestCartManagement',
             [
                 'quoteManagement' => $this->quoteManagementMock,
-                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock
+                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
+                'cartRepository' => $this->cartRepositoryMock
             ]
         );
     }
@@ -107,7 +136,9 @@ public function testPlaceOrder()
         $orderId = 1;
 
         $this->quoteIdMaskMock->expects($this->once())->method('load')->with($cartId, 'masked_id')->willReturnSelf();
-        $this->quoteIdMaskMock->expects($this->once())->method('getQuoteId')->willReturn($maskedCartId);
+        $this->cartRepositoryMock->expects($this->once())->method('get')->willReturn($this->quoteMock);
+        $this->quoteMock->expects($this->once())->method('setCheckoutMethod');
+        $this->quoteIdMaskMock->expects($this->any())->method('getQuoteId')->willReturn($maskedCartId);
         $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
         $this->quoteManagementMock->expects($this->once())->method('placeOrder')->willReturn($orderId);