Merge remote-tracking branch 'origin/MC-31277-PR' into MC-32120

Author: cpartica

app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/AvailableShippingMethods.php

@@ -59,7 +59,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" values should be specified'));
         }
-        $address = $value['model'];
+        $address = clone $value['model'];
+        $address->setLimitCarrier(null);
 
         // Allow shipping rates by setting country id for new addresses
         if (!$address->getCountryId() && $address->getCountryCode()) {

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

@@ -39,6 +39,7 @@ protected function setUp()
     }
 
     /**
+     * @magentoConfigFixture default_store carriers/freeshipping/active 1
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
@@ -64,7 +65,17 @@ public function testSetShippingMethodOnCartWithSimpleProduct()
         self::assertCount(1, $response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
 
         $shippingAddress = current($response['setShippingMethodsOnCart']['cart']['shipping_addresses']);
+        $availableShippingMethods = $shippingAddress['available_shipping_methods'];
+
         self::assertArrayHasKey('selected_shipping_method', $shippingAddress);
+        self::assertArrayHasKey('available_shipping_methods', $shippingAddress);
+
+        self::assertCount(2, $availableShippingMethods);
+        self::assertEquals('freeshipping', $availableShippingMethods[0]['carrier_code']);
+        self::assertEquals($carrierCode, $availableShippingMethods[1]['carrier_code']);
+
+        self::assertEquals($availableShippingMethods[0]['amount']['value'], 0);
+        self::assertEquals($availableShippingMethods[1]['amount']['value'], 10);
 
         self::assertArrayHasKey('carrier_code', $shippingAddress['selected_shipping_method']);
         self::assertEquals('flatrate', $shippingAddress['selected_shipping_method']['carrier_code']);
@@ -146,7 +157,7 @@ public function testSetShippingMethodWithWrongParameters(string $input, string $
         $query = <<<QUERY
 mutation {
   setShippingMethodsOnCart(input:  {
-   {$input}     
+   {$input}
   }) {
     cart {
       shipping_addresses {
@@ -237,7 +248,7 @@ public function testSetMultipleShippingMethods()
         $query = <<<QUERY
 mutation {
   setShippingMethodsOnCart(input:  {
-   cart_id: "{$maskedQuoteId}", 
+   cart_id: "{$maskedQuoteId}",
    shipping_methods: [
         {
             carrier_code: "flatrate"
@@ -329,9 +340,9 @@ private function getQuery(
     ): string {
         return <<<QUERY
 mutation {
-  setShippingMethodsOnCart(input: 
+  setShippingMethodsOnCart(input:
     {
-      cart_id: "$maskedQuoteId", 
+      cart_id: "$maskedQuoteId",
       shipping_methods: [{
         carrier_code: "$shippingCarrierCode"
         method_code: "$shippingMethodCode"
@@ -349,6 +360,12 @@ private function getQuery(
             currency
           }
         }
+        available_shipping_methods {
+          amount{
+            value
+          }
+          carrier_code
+        }
       }
     }
   }