GraphQL-293: [Payment methods] Set Payment Method on Cart

naydav · naydav · commit 27bc500e5d18 · 2019-02-26T17:55:57.000-06:00
-- Fixes after merge with mainline
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -205,6 +205,10 @@ public function testSetBillingAddressFromAddressBook()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -410,7 +414,8 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
             ['response_field' => 'city', 'expected_value' => 'test city'],
             ['response_field' => 'postcode', 'expected_value' => '887766'],
-            ['response_field' => 'telephone', 'expected_value' => '88776655']
+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
         ];
 
         $this->assertResponseFields($billingAddressResponse, $assertionMap);
@@ -430,7 +435,8 @@ private function assertSavedBillingAddressFields(array $billingAddressResponse):
             ['response_field' => 'street', 'expected_value' => [0 => 'Green str, 67']],
             ['response_field' => 'city', 'expected_value' => 'CityM'],
             ['response_field' => 'postcode', 'expected_value' => '75477'],
-            ['response_field' => 'telephone', 'expected_value' => '3468676']
+            ['response_field' => 'telephone', 'expected_value' => '3468676'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
         ];
 
         $this->assertResponseFields($billingAddressResponse, $assertionMap);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -78,6 +78,10 @@ public function testSetNewBillingAddress()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -130,6 +134,10 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
       shipping_addresses {
         firstname
@@ -139,6 +147,10 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         city
         postcode
         telephone
+        country {
+          code
+          label
+        }
       }
     }
   }
@@ -243,7 +255,8 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],
             ['response_field' => 'city', 'expected_value' => 'test city'],
             ['response_field' => 'postcode', 'expected_value' => '887766'],
-            ['response_field' => 'telephone', 'expected_value' => '88776655']
+            ['response_field' => 'telephone', 'expected_value' => '88776655'],
+            ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
         ];
 
         $this->assertResponseFields($billingAddressResponse, $assertionMap);

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ public function testSetNewBillingAddress()`
`78`	`78`	`city`
`79`	`79`	`postcode`
`80`	`80`	`telephone`
	`81`	`+ country {`
	`82`	`+ code`
	`83`	`+ label`
	`84`	`+ }`
`81`	`85`	`}`
`82`	`86`	`}`
`83`	`87`	`}`
`@@ -130,6 +134,10 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`130`	`134`	`city`
`131`	`135`	`postcode`
`132`	`136`	`telephone`
	`137`	`+ country {`
	`138`	`+ code`
	`139`	`+ label`
	`140`	`+ }`
`133`	`141`	`}`
`134`	`142`	`shipping_addresses {`
`135`	`143`	`firstname`
`@@ -139,6 +147,10 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`139`	`147`	`city`
`140`	`148`	`postcode`
`141`	`149`	`telephone`
	`150`	`+ country {`
	`151`	`+ code`
	`152`	`+ label`
	`153`	`+ }`
`142`	`154`	`}`
`143`	`155`	`}`
`144`	`156`	`}`
`@@ -243,7 +255,8 @@ private function assertNewAddressFields(array $billingAddressResponse): void`
`243`	`255`	`['response_field' => 'street', 'expected_value' => [0 => 'test street 1', 1 => 'test street 2']],`
`244`	`256`	`['response_field' => 'city', 'expected_value' => 'test city'],`
`245`	`257`	`['response_field' => 'postcode', 'expected_value' => '887766'],`
`246`		`- ['response_field' => 'telephone', 'expected_value' => '88776655']`
	`258`	`+ ['response_field' => 'telephone', 'expected_value' => '88776655'],`
	`259`	`+ ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],`
`247`	`260`	`];`
`248`	`261`
`249`	`262`	`$this->assertResponseFields($billingAddressResponse, $assertionMap);`