From 3758d4ca4f8ffc4470981665e9392279149bc850 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Thu, 27 Jul 2017 09:46:01 +0300
Subject: [PATCH] MAGETWO-60958: [Backport] Incorrect province code sent on
 Checkout to UPS #6564 - for 2.1 - MAGETWO-70727: [GitHub] Shipping method
 randomly dissapear when page refreshed for 2.1 #7497

---
 ...sertShippingMethodsSuccessEstimateAfterAddressEdit.php | 1 -
 .../Test/TestCase/OnePageEstimateShippingMethodsTest.xml  | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php
index 4c89b2fe05135..fa912d8660273 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodsSuccessEstimateAfterAddressEdit.php
@@ -40,7 +40,6 @@ public function processAssert(
         }
 
         if (!empty ($editAddressData)) {
-
             $address = $fixtureFactory->createByCode('address', ['data' => $editAddressData]);
             $testStepFactory->create(
                 FillShippingAddressStep::class,
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml
index e536fe1ed2848..73f197433e63f 100644
--- a/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageEstimateShippingMethodsTest.xml
@@ -7,7 +7,9 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Checkout\Test\TestCase\OnePageEstimateShippingMethodsTest" summary="Estimate shipping methods at checkout" ticketId="MAGETWO-71002">
-        <variation name="OnePageEstimateShippingMethodsTestUpsVariation1" ticketId="MAGETWO-71003">
+        <variation name="OnePageEstimateShippingMethodsTestUpsVariation1"
+                   summary="Estimate UPS shipping methods at checkout after shipping address modification"
+                   ticketId="MAGETWO-71003">
             <data name="products" xsi:type="string">catalogProductSimple::default</data>
             <data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>
             <data name="editAddressData" xsi:type="array">
@@ -19,7 +21,9 @@
             <data name="configData" xsi:type="string">ups, shipping_origin_US_CA</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertShippingMethodsSuccessEstimateAfterAddressEdit" />
         </variation>
-        <variation name="OnePageEstimateShippingMethodsTestUpsVariation2" ticketId="MAGETWO-71044">
+        <variation name="OnePageEstimateShippingMethodsTestUpsVariation2"
+                   summary="Estimate UPS shipping methods at checkout after customer log in"
+                   ticketId="MAGETWO-71044">
             <data name="products" xsi:type="string">catalogProductSimple::default</data>
             <data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
             <data name="checkoutMethod" xsi:type="string">login</data>