Skip to content

Commit 997e676

Browse files
committed
MC-19746: The shipping address contains null values when there's no shipping address set on a cart
- fix tests
1 parent 58b049d commit 997e676

File tree

2 files changed

+2
-74
lines changed

2 files changed

+2
-74
lines changed

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

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@ public function testGetSpecifiedShippingAddress()
7777
self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
7878
}
7979

80-
/**
81-
* @magentoApiDataFixture Magento/Customer/_files/customer.php
82-
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
83-
*/
84-
public function testShippingAddressOnCreatedEmptyCart()
85-
{
86-
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
87-
$query = $this->getQuery($maskedQuoteId);
88-
89-
$response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
90-
self::assertArrayHasKey('cart', $response);
91-
self::assertArrayHasKey('shipping_addresses', $response['cart']);
92-
93-
self::assertCount(0, $response['cart']['shipping_addresses']);
94-
}
95-
9680
/**
9781
* @magentoApiDataFixture Magento/Customer/_files/customer.php
9882
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
@@ -108,28 +92,7 @@ public function testGetSpecifiedShippingAddressIfShippingAddressIsNotSet()
10892
self::assertArrayHasKey('cart', $response);
10993
self::assertArrayHasKey('shipping_addresses', $response['cart']);
11094

111-
$expectedShippingAddressData = [
112-
'firstname' => null,
113-
'lastname' => null,
114-
'company' => null,
115-
'street' => [
116-
''
117-
],
118-
'city' => null,
119-
'region' => [
120-
'code' => null,
121-
'label' => null,
122-
],
123-
'postcode' => null,
124-
'country' => [
125-
'code' => null,
126-
'label' => null,
127-
],
128-
'telephone' => null,
129-
'__typename' => 'ShippingCartAddress',
130-
'customer_notes' => null,
131-
];
132-
self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
95+
self::assertEquals(0, $response['cart']['shipping_addresses']);
13396
}
13497

13598
/**

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/GetSpecifiedShippingAddressTest.php

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,6 @@ public function testGetSpecifiedShippingAddress()
6868
self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
6969
}
7070

71-
/**
72-
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
73-
*/
74-
public function testShippingAddressOnCreatedEmptyCart()
75-
{
76-
$maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
77-
$query = $this->getQuery($maskedQuoteId);
78-
79-
$response = $this->graphQlQuery($query);
80-
self::assertArrayHasKey('cart', $response);
81-
self::assertArrayHasKey('shipping_addresses', $response['cart']);
82-
83-
self::assertCount(0, $response['cart']['shipping_addresses']);
84-
}
85-
8671
/**
8772
* @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
8873
* @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
@@ -97,27 +82,7 @@ public function testGetSpecifiedShippingAddressIfShippingAddressIsNotSet()
9782
self::assertArrayHasKey('cart', $response);
9883
self::assertArrayHasKey('shipping_addresses', $response['cart']);
9984

100-
$expectedShippingAddressData = [
101-
'firstname' => null,
102-
'lastname' => null,
103-
'company' => null,
104-
'street' => [
105-
''
106-
],
107-
'city' => null,
108-
'region' => [
109-
'code' => null,
110-
'label' => null,
111-
],
112-
'postcode' => null,
113-
'country' => [
114-
'code' => null,
115-
'label' => null,
116-
],
117-
'telephone' => null,
118-
'__typename' => 'ShippingCartAddress',
119-
];
120-
self::assertEquals($expectedShippingAddressData, current($response['cart']['shipping_addresses']));
85+
self::assertEquals([], $response['cart']['shipping_addresses']);
12186
}
12287

12388
/**

0 commit comments

Comments
 (0)