Skip to content
Snippets Groups Projects
Commit 60ccb72c authored by Cari Spruiell's avatar Cari Spruiell
Browse files

MAGETWO-36560: Fix builds

 - fixed namespace error
 - fixed code formatting issues
parent 04a43352
Branches
No related merge requests found
...@@ -21,7 +21,7 @@ class GuestCouponManagement implements GuestCouponManagementInterface ...@@ -21,7 +21,7 @@ class GuestCouponManagement implements GuestCouponManagementInterface
*/ */
private $quoteIdMaskFactory; private $quoteIdMaskFactory;
/** /**
* @var CouponManagementInterface * @var CouponManagementInterface
*/ */
private $couponManagement; private $couponManagement;
......
...@@ -9,6 +9,7 @@ use Magento\Quote\Api\GuestShippingAddressManagementInterface; ...@@ -9,6 +9,7 @@ use Magento\Quote\Api\GuestShippingAddressManagementInterface;
use Magento\Quote\Model\QuoteIdMask; use Magento\Quote\Model\QuoteIdMask;
use Magento\Quote\Model\QuoteIdMaskFactory; use Magento\Quote\Model\QuoteIdMaskFactory;
use Magento\Quote\Api\ShippingAddressManagementInterface; use Magento\Quote\Api\ShippingAddressManagementInterface;
/** /**
* Shipping address management class for guest carts. * Shipping address management class for guest carts.
*/ */
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* See COPYING.txt for license details. * See COPYING.txt for license details.
*/ */
namespace Magento\Quote\Test\Unit\Model\Quote\Item; namespace Magento\Quote\Test\Unit\Model\GuestCart;
class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
{ {
...@@ -58,10 +58,11 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase ...@@ -58,10 +58,11 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
* @var \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper * @var \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper
*/ */
$guestCartTestHelper = new \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper($this); $guestCartTestHelper = new \Magento\Quote\Test\Unit\Model\GuestCart\GuestCartTestHelper($this);
list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) = $guestCartTestHelper->mockQuoteIdMask( list($this->quoteIdMaskFactoryMock, $this->quoteIdMaskMock) =
$this->maskedCartId, $guestCartTestHelper->mockQuoteIdMask(
$this->cartId $this->maskedCartId,
); $this->cartId
);
$this->quoteIdMaskMock->expects($this->any()) $this->quoteIdMaskMock->expects($this->any())
->method('getMaskedId') ->method('getMaskedId')
...@@ -80,12 +81,13 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase ...@@ -80,12 +81,13 @@ class GuestCartItemRepositoryTest extends \PHPUnit_Framework_TestCase
$this->cartItemRepositoryMock = $this->getMock('\Magento\Quote\Model\Quote\Item\Repository', [], [], '', false); $this->cartItemRepositoryMock = $this->getMock('\Magento\Quote\Model\Quote\Item\Repository', [], [], '', false);
$this->guestCartItemRepository = $this->guestCartItemRepository =
$objectManager->getObject('Magento\Quote\Model\GuestCart\GuestCartItemRepository', $objectManager->getObject(
[ 'Magento\Quote\Model\GuestCart\GuestCartItemRepository',
'repository' => $this->cartItemRepositoryMock, [
'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock, 'repository' => $this->cartItemRepositoryMock,
] 'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
); ]
);
} }
/** /**
......
...@@ -46,7 +46,7 @@ class GuestCartRepositoryTest extends \PHPUnit_Framework_TestCase ...@@ -46,7 +46,7 @@ class GuestCartRepositoryTest extends \PHPUnit_Framework_TestCase
protected function setUp() protected function setUp()
{ {
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->quoteRepositoryMock = $this->getMock( 'Magento\Quote\Api\CartRepositoryInterface', [], [], '', false); $this->quoteRepositoryMock = $this->getMock('Magento\Quote\Api\CartRepositoryInterface', [], [], '', false);
$this->quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false); $this->quoteMock = $this->getMock('Magento\Quote\Model\Quote', [], [], '', false);
$this->maskedCartId = 'f216207248d65c789b17be8545e0aa73'; $this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';
......
...@@ -36,14 +36,15 @@ class GuestCartTestHelper ...@@ -36,14 +36,15 @@ class GuestCartTestHelper
* @param $cartId * @param $cartId
* @return array * @return array
*/ */
public function mockQuoteIdMask( $maskedCartId, $cartId) public function mockQuoteIdMask($maskedCartId, $cartId)
{ {
$quoteIdMaskMock = $this->testCase->getMock( $quoteIdMaskMock = $this->testCase->getMock(
'Magento\Quote\Model\QuoteIdMask', 'Magento\Quote\Model\QuoteIdMask',
['load', 'getId', 'getMaskedId'], ['load', 'getId', 'getMaskedId'],
[], [],
'', '',
false); false
);
$quoteIdMaskFactoryMock = $this->testCase->getMock('Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false); $quoteIdMaskFactoryMock = $this->testCase->getMock('Magento\Quote\Model\QuoteIdMaskFactory', [], [], '', false);
$quoteIdMaskFactoryMock->expects($this->testCase->once())->method('create')->willReturn($quoteIdMaskMock); $quoteIdMaskFactoryMock->expects($this->testCase->once())->method('create')->willReturn($quoteIdMaskMock);
$quoteIdMaskMock->expects($this->testCase->once())->method('load')->with($maskedCartId)->willReturnSelf(); $quoteIdMaskMock->expects($this->testCase->once())->method('load')->with($maskedCartId)->willReturnSelf();
......
...@@ -46,7 +46,7 @@ class GuestCouponManagementTest extends \PHPUnit_Framework_TestCase ...@@ -46,7 +46,7 @@ class GuestCouponManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp() protected function setUp()
{ {
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->couponManagementMock = $this->getMock( 'Magento\Quote\Api\CouponManagementInterface', [], [], '', false); $this->couponManagementMock = $this->getMock('Magento\Quote\Api\CouponManagementInterface', [], [], '', false);
$this->couponCode = 'test_coupon_code'; $this->couponCode = 'test_coupon_code';
$this->maskedCartId = 'f216207248d65c789b17be8545e0aa73'; $this->maskedCartId = 'f216207248d65c789b17be8545e0aa73';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment