GraphQL-575: Schema inconsistency of "SelectedShippingMethod" declaration

Author: naydav

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

@@ -32,12 +32,13 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $rates = $address->getAllShippingRates();
 
         if (count($rates) > 0) {
+            list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);
             /** @var Rate $rate */
             $rate = current($rates);
 
             $data = [
-                'carrier_code' => $rate->getCarrier(),
-                'method_code' => $rate->getMethod(),
+                'carrier_code' => $carrierCode,
+                'method_code' => $methodCode,
                 'carrier_title' => $rate->getCarrierTitle(),
                 'method_title' => $rate->getMethodTitle(),
                 'amount' => [

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

@@ -110,7 +110,7 @@ public function testGeSpecifiedBillingAddressIfBillingAddressIsNotSet()
                 'label' => null,
             ],
             'telephone' => null,
-            '__typename' => null,
+            '__typename' => 'BillingCartAddress',
             'customer_notes' => null,
         ];
         self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);

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

@@ -100,7 +100,7 @@ public function testGeSpecifiedBillingAddressIfBillingAddressIsNotSet()
                 'label' => null,
             ],
             'telephone' => null,
-            '__typename' => null,
+            '__typename' => 'BillingCartAddress',
         ];
         self::assertEquals($expectedBillingAddressData, $response['cart']['billing_address']);
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php

@@ -115,7 +115,6 @@ public function testSetUpsShippingMethod(string $methodCode, string $methodTitle
         self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);
 
         self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
     }
 
     /**
@@ -170,7 +169,6 @@ public function testSetUpsShippingMethodBasedOnCanadaAddress(string $methodCode,
         self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);
 
         self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
-        self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
     }
 
     /**