Skip to content

Commit 372b03e

Browse files
naydavnaydav
committed
Merge remote-tracking branch 'origin/432-reversed-quote-id-test-coverage' into GraphQL-538
2 parents 6d8e725 + 7257401 commit 372b03e

13 files changed

+206
-204
lines changed

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetAvailablePaymentMethodsTest.php

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77

88
namespace Magento\GraphQl\Quote\Customer;
99

10+
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
1011
use Magento\Integration\Api\CustomerTokenServiceInterface;
11-
use Magento\Quote\Model\QuoteFactory;
12-
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
13-
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
1412
use Magento\TestFramework\Helper\Bootstrap;
1513
use Magento\TestFramework\TestCase\GraphQlAbstract;
1614

@@ -25,29 +23,17 @@ class GetAvailablePaymentMethodsTest extends GraphQlAbstract
2523
private $customerTokenService;
2624

2725
/**
28-
* @var QuoteResource
26+
* @var GetMaskedQuoteIdByReservedOrderId
2927
*/
30-
private $quoteResource;
31-
32-
/**
33-
* @var QuoteFactory
34-
*/
35-
private $quoteFactory;
36-
37-
/**
38-
* @var QuoteIdToMaskedQuoteIdInterface
39-
*/
40-
private $quoteIdToMaskedId;
28+
private $getMaskedQuoteIdByReservedOrderId;
4129

4230
/**
4331
* @inheritdoc
4432
*/
4533
protected function setUp()
4634
{
4735
$objectManager = Bootstrap::getObjectManager();
48-
$this->quoteResource = $objectManager->get(QuoteResource::class);
49-
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
50-
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
36+
$this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
5137
$this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
5238
}
5339

@@ -56,7 +42,7 @@ protected function setUp()
5642
*/
5743
public function testGetCartWithPaymentMethods()
5844
{
59-
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
45+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
6046
$query = $this->getQuery($maskedQuoteId);
6147
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
6248

@@ -76,7 +62,7 @@ public function testGetCartWithPaymentMethods()
7662
*/
7763
public function testGetPaymentMethodsFromGuestCart()
7864
{
79-
$guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId(
65+
$guestQuoteMaskedId = $this->getMaskedQuoteIdByReservedOrderId->execute(
8066
'test_order_with_virtual_product_without_address'
8167
);
8268
$query = $this->getQuery($guestQuoteMaskedId);
@@ -93,7 +79,7 @@ public function testGetPaymentMethodsFromGuestCart()
9379
*/
9480
public function testGetPaymentMethodsFromAnotherCustomerCart()
9581
{
96-
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
82+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
9783
$query = $this->getQuery($maskedQuoteId);
9884

9985
$this->expectExceptionMessage(
@@ -108,7 +94,7 @@ public function testGetPaymentMethodsFromAnotherCustomerCart()
10894
*/
10995
public function testGetPaymentMethodsIfPaymentsAreNotSet()
11096
{
111-
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId('test_order_item_with_items');
97+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
11298
$query = $this->getQuery($maskedQuoteId);
11399
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
114100

@@ -158,16 +144,4 @@ private function getHeaderMap(string $username = '[email protected]', string
158144
$headerMap = ['Authorization' => 'Bearer ' . $customerToken];
159145
return $headerMap;
160146
}
161-
162-
/**
163-
* @param string $reservedOrderId
164-
* @return string
165-
*/
166-
private function getMaskedQuoteIdByReservedOrderId(string $reservedOrderId): string
167-
{
168-
$quote = $this->quoteFactory->create();
169-
$this->quoteResource->load($quote, $reservedOrderId, 'reserved_order_id');
170-
171-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
172-
}
173147
}

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetCartTest.php

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\GraphQl\Quote\Customer;
99

10+
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
1011
use Magento\Integration\Api\CustomerTokenServiceInterface;
1112
use Magento\Quote\Model\QuoteFactory;
1213
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -19,6 +20,11 @@
1920
*/
2021
class GetCartTest extends GraphQlAbstract
2122
{
23+
/**
24+
* @var GetMaskedQuoteIdByReservedOrderId
25+
*/
26+
private $getMaskedQuoteIdByReservedOrderId;
27+
2228
/**
2329
* @var QuoteResource
2430
*/
@@ -42,6 +48,7 @@ class GetCartTest extends GraphQlAbstract
4248
protected function setUp()
4349
{
4450
$objectManager = Bootstrap::getObjectManager();
51+
$this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
4552
$this->quoteResource = $objectManager->get(QuoteResource::class);
4653
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
4754
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -53,7 +60,7 @@ protected function setUp()
5360
*/
5461
public function testGetCart()
5562
{
56-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
63+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
5764
$query = $this->getCartQuery($maskedQuoteId);
5865

5966
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -77,7 +84,9 @@ public function testGetCart()
7784
*/
7885
public function testGetGuestCart()
7986
{
80-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
87+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
88+
'test_order_with_simple_product_without_address'
89+
);
8190
$query = $this->getCartQuery($maskedQuoteId);
8291

8392
$this->expectExceptionMessage(
@@ -92,7 +101,7 @@ public function testGetGuestCart()
92101
*/
93102
public function testGetAnotherCustomerCart()
94103
{
95-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_item_with_items');
104+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_item_with_items');
96105
$query = $this->getCartQuery($maskedQuoteId);
97106

98107
$this->expectExceptionMessage(
@@ -156,18 +165,6 @@ private function getCartQuery(
156165
QUERY;
157166
}
158167

159-
/**
160-
* @param string $reversedQuoteId
161-
* @return string
162-
*/
163-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
164-
{
165-
$quote = $this->quoteFactory->create();
166-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
167-
168-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
169-
}
170-
171168
/**
172169
* @param string $username
173170
* @param string $password

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\GraphQl\Quote\Customer;
99

10+
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
1011
use Magento\Integration\Api\CustomerTokenServiceInterface;
1112
use Magento\Quote\Model\QuoteFactory;
1213
use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
@@ -19,6 +20,11 @@
1920
*/
2021
class SetBillingAddressOnCartTest extends GraphQlAbstract
2122
{
23+
/**
24+
* @var GetMaskedQuoteIdByReservedOrderId
25+
*/
26+
private $getMaskedQuoteIdByReservedOrderId;
27+
2228
/**
2329
* @var QuoteResource
2430
*/
@@ -42,6 +48,7 @@ class SetBillingAddressOnCartTest extends GraphQlAbstract
4248
protected function setUp()
4349
{
4450
$objectManager = Bootstrap::getObjectManager();
51+
$this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
4552
$this->quoteResource = $objectManager->get(QuoteResource::class);
4653
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
4754
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -310,7 +317,9 @@ public function testSetNewBillingAddressAndFromAddressBookAtSameTime()
310317
*/
311318
public function testSetBillingAddressToGuestCart()
312319
{
313-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
320+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
321+
'test_order_with_simple_product_without_address'
322+
);
314323

315324
$query = <<<QUERY
316325
mutation {
@@ -480,28 +489,16 @@ private function getHeaderMap(string $username = '[email protected]', string
480489
}
481490

482491
/**
483-
* @param string $reversedQuoteId
484-
* @return string
485-
*/
486-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
487-
{
488-
$quote = $this->quoteFactory->create();
489-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
490-
491-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
492-
}
493-
494-
/**
495-
* @param string $reversedQuoteId
492+
* @param string $reversedOrderId
496493
* @param int $customerId
497494
* @return string
498495
*/
499496
private function assignQuoteToCustomer(
500-
string $reversedQuoteId = 'test_order_with_simple_product_without_address',
497+
string $reversedOrderId = 'test_order_with_simple_product_without_address',
501498
int $customerId = 1
502499
): string {
503500
$quote = $this->quoteFactory->create();
504-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
501+
$this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
505502
$quote->setCustomerId($customerId);
506503
$this->quoteResource->save($quote);
507504
return $this->quoteIdToMaskedId->execute((int)$quote->getId());

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodOnCartTest.php

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\GraphQl\Quote\Customer;
99

10+
use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
1011
use Magento\Integration\Api\CustomerTokenServiceInterface;
1112
use Magento\OfflinePayments\Model\Checkmo;
1213
use Magento\Quote\Model\QuoteFactory;
@@ -20,6 +21,11 @@
2021
*/
2122
class SetPaymentMethodOnCartTest extends GraphQlAbstract
2223
{
24+
/**
25+
* @var GetMaskedQuoteIdByReservedOrderId
26+
*/
27+
private $getMaskedQuoteIdByReservedOrderId;
28+
2329
/**
2430
* @var CustomerTokenServiceInterface
2531
*/
@@ -46,6 +52,7 @@ class SetPaymentMethodOnCartTest extends GraphQlAbstract
4652
protected function setUp()
4753
{
4854
$objectManager = Bootstrap::getObjectManager();
55+
$this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
4956
$this->quoteResource = $objectManager->get(QuoteResource::class);
5057
$this->quoteFactory = $objectManager->get(QuoteFactory::class);
5158
$this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
@@ -58,7 +65,7 @@ protected function setUp()
5865
public function testSetPaymentWithVirtualProduct()
5966
{
6067
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
61-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_virtual_product');
68+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_with_virtual_product');
6269

6370
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
6471
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -75,7 +82,7 @@ public function testSetPaymentWithVirtualProduct()
7582
public function testSetPaymentWithSimpleProduct()
7683
{
7784
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
78-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
85+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
7986

8087
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
8188
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -109,7 +116,7 @@ public function testSetPaymentWithSimpleProductWithoutAddress()
109116
public function testSetNonExistingPaymentMethod()
110117
{
111118
$methodCode = 'noway';
112-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
119+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
113120

114121
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
115122
$this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -122,7 +129,9 @@ public function testSetNonExistingPaymentMethod()
122129
public function testSetPaymentMethodToGuestCart()
123130
{
124131
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
125-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_with_simple_product_without_address');
132+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute(
133+
'test_order_with_simple_product_without_address'
134+
);
126135

127136
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
128137

@@ -140,7 +149,7 @@ public function testSetPaymentMethodToGuestCart()
140149
public function testSetPaymentMethodToAnotherCustomerCart()
141150
{
142151
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
143-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1');
152+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
144153

145154
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
146155

@@ -177,7 +186,7 @@ public function testPaymentMethodOnNonExistentCart()
177186
public function testReSetPayment()
178187
{
179188
/** @var \Magento\Quote\Model\Quote $quote */
180-
$maskedQuoteId = $this->getMaskedQuoteIdByReversedQuoteId('test_order_1_with_payment');
189+
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1_with_payment');
181190
$methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
182191
$query = $this->prepareMutationQuery($maskedQuoteId, $methodCode);
183192
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
@@ -216,28 +225,16 @@ private function prepareMutationQuery(
216225
}
217226

218227
/**
219-
* @param string $reversedQuoteId
220-
* @return string
221-
*/
222-
private function getMaskedQuoteIdByReversedQuoteId(string $reversedQuoteId): string
223-
{
224-
$quote = $this->quoteFactory->create();
225-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
226-
227-
return $this->quoteIdToMaskedId->execute((int)$quote->getId());
228-
}
229-
230-
/**
231-
* @param string $reversedQuoteId
228+
* @param string $reversedOrderId
232229
* @param int $customerId
233230
* @return string
234231
*/
235232
private function assignQuoteToCustomer(
236-
string $reversedQuoteId,
233+
string $reversedOrderId,
237234
int $customerId
238235
): string {
239236
$quote = $this->quoteFactory->create();
240-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
237+
$this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
241238
$quote->setCustomerId($customerId);
242239
$this->quoteResource->save($quote);
243240
return $this->quoteIdToMaskedId->execute((int)$quote->getId());

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,16 +513,16 @@ private function getHeaderMap(string $username = '[email protected]', string
513513
}
514514

515515
/**
516-
* @param string $reversedQuoteId
516+
* @param string $reversedOrderId
517517
* @param int $customerId
518518
* @return string
519519
*/
520520
private function assignQuoteToCustomer(
521-
string $reversedQuoteId = 'test_order_with_simple_product_without_address',
521+
string $reversedOrderId = 'test_order_with_simple_product_without_address',
522522
int $customerId = 1
523523
): string {
524524
$quote = $this->quoteFactory->create();
525-
$this->quoteResource->load($quote, $reversedQuoteId, 'reserved_order_id');
525+
$this->quoteResource->load($quote, $reversedOrderId, 'reserved_order_id');
526526
$quote->setCustomerId($customerId);
527527
$this->quoteResource->save($quote);
528528
return $this->quoteIdToMaskedId->execute((int)$quote->getId());

0 commit comments

Comments
 (0)