Skip to content

Commit fd9b52e

Browse files
alzotaalzota
committed
ACP2E-3108: address PR comments
1 parent 469b3d7 commit fd9b52e

File tree

3 files changed

+25
-85
lines changed

3 files changed

+25
-85
lines changed

‎dev/tests/api-functional/testsuite/Magento/GraphQl/CmsGraphQl/Model/Resolver/BlockTest.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ public function testCmsSingleBlockResolverCacheAndInvalidationAsGuest()
109109
}
110110

111111
#[
112-
DataFixture(BlockFixture::class, as: 'block1'),
113-
DataFixture(BlockFixture::class, as: 'block2')
112+
DataFixture(BlockFixture::class, as: 'block', count: 2)
114113
]
115114
public function testCmsMultipleBlockResolverCacheAndInvalidationAsGuest()
116115
{
@@ -190,11 +189,11 @@ public function testCmsBlockResolverCacheInvalidatesWhenBlockGetsDeleted()
190189
}
191190

192191
#[
193-
DataFixture(BlockFixture::class, as: 'disabled_block')
192+
DataFixture(BlockFixture::class, as: 'enabled_block')
194193
]
195194
public function testCmsBlockResolverCacheInvalidatesWhenBlockGetsDisabled()
196195
{
197-
$block = $this->fixtures->get('disabled_block');
196+
$block = $this->fixtures->get('enabled_block');
198197

199198
$query = $this->getQuery([
200199
$block->getIdentifier(),
@@ -301,9 +300,8 @@ public function testCmsBlockResolverCacheDoesNotSaveNonExistentCmsBlock()
301300
}
302301

303302
#[
304-
Config('system/full_page_cache/caching_application', '2', 'store', 'default'),
305-
DataFixture(BlockFixture::class, as: 'block1'),
306-
DataFixture(BlockFixture::class, as: 'block2')
303+
Config('system/full_page_cache/caching_application', '2'),
304+
DataFixture(BlockFixture::class, as: 'block', count: 2)
307305
]
308306
public function testCmsBlockResolverCacheRetainsEntriesThatHaveNotBeenUpdated()
309307
{

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
2121
use Magento\Quote\Test\Fixture\AddProductToCart;
2222
use Magento\Quote\Test\Fixture\GuestCart;
23-
use Magento\Quote\Test\Fixture\QuoteIdMask;
2423
use Magento\TestFramework\Fixture\DataFixture;
2524
use Magento\TestFramework\Fixture\DataFixtureStorage;
2625
use Magento\TestFramework\Fixture\DataFixtureStorageManager;
@@ -732,13 +731,9 @@ public function testSetBillingAddressToAnotherCustomerCart()
732731
* _security
733732
*/
734733
#[
735-
DataFixture(Customer::class, ['addresses' => [['postcode' => '12345']]], as: 'customer1'),
736-
DataFixture(Customer::class, ['addresses' => [['postcode' => '12345']]], as: 'customer2'),
734+
DataFixture(Customer::class, ['addresses' => [['postcode' => '12345']]], as: 'customer', count: 2),
737735
DataFixture(Product::class, as: 'product'),
738-
DataFixture(GuestCart::class, ['customer_id' => '$customer2.id$'], as: 'cart'),
739-
DataFixture(QuoteIdMask::class, [
740-
'cart_id' => '$cart.id$'
741-
], 'quoteIdMask'),
736+
DataFixture(GuestCart::class, ['customer_email' => '$customer2.email$'], as: 'cart'),
742737
DataFixture(AddProductToCart::class, [
743738
'cart_id' => '$cart.id$',
744739
'product_id' => '$product.id$',
@@ -755,7 +750,7 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
755750

756751
/** @var Quote $quote */
757752
$quote = $this->fixtures->get('cart');
758-
$maskedQuoteId = $this->fixtures->get('quoteIdMask')->getMaskedId();
753+
$maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$quote->getId());
759754

760755
$quote->setCustomer($customer2);
761756
$quote->setCustomerIsGuest(false);

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php‎

Lines changed: 17 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -435,78 +435,31 @@ public function testGetMatchingOrdersForLowerQueryLength()
435435
*/
436436
#[
437437
DataFixture(Customer::class, as: 'customer'),
438+
DataFixture(ProductFixture::class, as: 'product'),
438439

439440
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart1'),
440-
DataFixture(ProductFixture::class, ['price' => 10], 'p1'),
441-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart1.id$', 'product_id' => '$p1.id$']),
441+
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart1.id$', 'product_id' => '$product.id$']),
442442
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart1.id$']),
443443
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart1.id$']),
444444
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart1.id$']),
445445
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart1.id$']),
446446
DataFixture(PlaceOrder::class, ['cart_id' => '$cart1.id$'], 'or1'),
447447

448448
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart2'),
449-
DataFixture(ProductFixture::class, ['price' => 10], 'p2'),
450-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart2.id$', 'product_id' => '$p2.id$']),
449+
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart2.id$', 'product_id' => '$product.id$']),
451450
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart2.id$']),
452451
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart2.id$']),
453452
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart2.id$']),
454453
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart2.id$']),
455454
DataFixture(PlaceOrder::class, ['cart_id' => '$cart2.id$'], 'or2'),
456455

457456
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart3'),
458-
DataFixture(ProductFixture::class, ['price' => 10], 'p3'),
459-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart3.id$', 'product_id' => '$p3.id$']),
457+
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart3.id$', 'product_id' => '$product.id$']),
460458
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart3.id$']),
461459
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart3.id$']),
462460
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart3.id$']),
463461
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart3.id$']),
464-
DataFixture(PlaceOrder::class, ['cart_id' => '$cart3.id$'], 'or3'),
465-
466-
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart4'),
467-
DataFixture(ProductFixture::class, ['price' => 10], 'p4'),
468-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart4.id$', 'product_id' => '$p4.id$']),
469-
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart4.id$']),
470-
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart4.id$']),
471-
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart4.id$']),
472-
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart4.id$']),
473-
DataFixture(PlaceOrder::class, ['cart_id' => '$cart4.id$'], 'or4'),
474-
475-
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart5'),
476-
DataFixture(ProductFixture::class, ['price' => 10], 'p5'),
477-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart5.id$', 'product_id' => '$p5.id$']),
478-
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart5.id$']),
479-
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart5.id$']),
480-
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart5.id$']),
481-
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart5.id$']),
482-
DataFixture(PlaceOrder::class, ['cart_id' => '$cart5.id$'], 'or5'),
483-
484-
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart6'),
485-
DataFixture(ProductFixture::class, ['price' => 10], 'p6'),
486-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart6.id$', 'product_id' => '$p6.id$']),
487-
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart6.id$']),
488-
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart6.id$']),
489-
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart6.id$']),
490-
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart6.id$']),
491-
DataFixture(PlaceOrder::class, ['cart_id' => '$cart6.id$'], 'or6'),
492-
493-
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart7'),
494-
DataFixture(ProductFixture::class, ['price' => 10], 'p7'),
495-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart7.id$', 'product_id' => '$p7.id$']),
496-
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart7.id$']),
497-
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart7.id$']),
498-
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart7.id$']),
499-
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart7.id$']),
500-
DataFixture(PlaceOrder::class, ['cart_id' => '$cart7.id$'], 'or7'),
501-
502-
DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], 'cart8'),
503-
DataFixture(ProductFixture::class, ['price' => 10], 'p8'),
504-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart8.id$', 'product_id' => '$p8.id$']),
505-
DataFixture(SetBillingAddress::class, ['cart_id' => '$cart8.id$']),
506-
DataFixture(SetShippingAddress::class, ['cart_id' => '$cart8.id$']),
507-
DataFixture(SetDeliveryMethod::class, ['cart_id' => '$cart8.id$']),
508-
DataFixture(SetPaymentMethod::class, ['cart_id' => '$cart8.id$']),
509-
DataFixture(PlaceOrder::class, ['cart_id' => '$cart8.id$'], 'or8'),
462+
DataFixture(PlaceOrder::class, ['cart_id' => '$cart3.id$'], 'or3')
510463
]
511464
public function testGetCustomerDescendingSortedOrders()
512465
{
@@ -544,31 +497,25 @@ public function testGetCustomerDescendingSortedOrders()
544497
$this->assertArrayHasKey('items', $response['customer']['orders']);
545498
$customerOrderItemsInResponse = $response['customer']['orders']['items'];
546499

547-
$orderNumberCreatedAt = [];
548-
for ($i = 1; $i <= 8; $i++) {
500+
$orderNumberCreatedAtExpected = [];
501+
for ($i = 1; $i <= 3; $i++) {
549502
$orderNumber = $this->fixtures->get('or' . $i)->getIncrementId();
550503
$orderCreatedAt = $this->fixtures->get('or' . $i)->getCreatedAt();
551-
$orderNumberCreatedAt[$orderNumber] = $orderCreatedAt;
504+
$orderNumberCreatedAtExpected[$orderNumber] = $orderCreatedAt;
552505
}
553506

554-
array_multisort($orderNumberCreatedAt, SORT_DESC);
507+
array_multisort($orderNumberCreatedAtExpected, SORT_DESC);
555508

556-
$expectedOrderNumbers = [];
557-
foreach ($customerOrderItemsInResponse as $key => $item) {
558-
if (isset($orderNumberCreatedAt[$item['number']])
559-
&& $item['order_date'] == $orderNumberCreatedAt[$item['number']]) {
560-
$expectedOrderNumbers[] = $item['number'];
561-
}
509+
$orderNumberCreatedAtResponse = [];
510+
foreach ($customerOrderItemsInResponse as $item) {
511+
$orderNumberCreatedAtResponse[$item['number']] = $item['order_date'];
562512
}
563513

564-
foreach ($expectedOrderNumbers as $key => $data) {
565-
$orderItemInResponse = $customerOrderItemsInResponse[$key];
566-
$this->assertEquals(
567-
$data,
568-
$orderItemInResponse['number'],
569-
"The order number is different than the expected for order - {$data}"
570-
);
571-
}
514+
$this->assertEquals(
515+
$orderNumberCreatedAtExpected,
516+
$orderNumberCreatedAtResponse,
517+
"The order number is different than the expected for order"
518+
);
572519
}
573520

574521
/**

0 commit comments

Comments
 (0)