Final changes done

Author: Sahil.kumar

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CheckoutPaymentSection">
         <element name="isPaymentSection" type="text" selector="//*[@class='opc-progress-bar']/li[contains(@class, '_active') and span[contains(.,'Review &amp; Payments')]]"/>
         <element name="availablePaymentSolutions" type="text" selector="#checkout-payment-method-load>div>div>div:nth-child(2)>div.payment-method-title.field.choice"/>
@@ -48,7 +48,10 @@
         <element name="ProductOptionsActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']" parameterized="true" />
         <element name="ProductOptionLinkActiveByProductItemName" type="text" selector="//div[@class='product-item-details']//strong[@class='product-item-name'][text()='{{var1}}']//ancestor::div[@class='product-item-details']//div[@class='product options active']//a[text() = '{{var2}}']" parameterized="true" />
         <element name="shipToInformation" type="text" selector="//div[@class='ship-to']//div[@class='shipping-information-content']" />
-        <element name="shippingMethodInformation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']" />
+        <element name="editShipToInformation" type="button" selector="//div[@class='ship-to']//button[@class='action action-edit']"/>
+        <element name="shippingMethodInformation" type="text" selector="//div[@class='ship-via']//div[@class='shipping-information-content']"/>
+        <element name="editShipMethodInformation" type="button" selector="//div[@class='ship-via']//button[@class='action action-edit']"/>
+        <element name="shippingMethodTitle" type="text" selector="//div[text()='Shipping Methods']"/>
         <element name="shippingInformationSection" type="text" selector=".ship-to .shipping-information-content" />
         <element name="paymentMethodTitle" type="text" selector=".payment-method-title span" />
         <element name="productOptionsByProductItemPrice" type="text" selector="//div[@class='product-item-inner']//div[@class='subtotal']//span[@class='price'][contains(.,'{{price}}')]//ancestor::div[@class='product-item-details']//div[@class='product options']" parameterized="true"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifyShipToShipMethodContainsSameDataTest.xml

@@ -63,6 +63,7 @@
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <!-- Check that "Ship To" block contains correct information -->
+        <waitForElementVisible selector="{{CheckoutPaymentSection.shipToInformation}}" stepKey="waitForShippingInformationToAppear"/>
         <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.firstName}}" stepKey="seeShipToFirstName" />
         <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.lastName}}" stepKey="seeShipToLastName" />
         <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="seeShipToStreet" />
@@ -72,7 +73,7 @@
         <see selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="seeShipToTelephone" />
         <!-- Assert Shipping Method = "Flat Rate" -->
         <see userInput="Flat Rate - Fixed" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethodAgain"/>
-       <!-- click on Edit button next to "Ship To" Text -->
+        <!-- click on Edit button next to "Ship To" Text -->
         <click selector="{{CheckoutPaymentSection.editShipToInformation}}" stepKey="clickOnEditButton"/>
         <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSectionAgain">
             <argument name="customerVar" value="CustomerEntityOne"/>
@@ -87,7 +88,7 @@
         <!-- click on Edit button next to "Shipping Method" Text -->
         <click selector="{{CheckoutPaymentSection.editShipMethodInformation}}" stepKey="clickOnEditShippingMethodButton"/>
         <!-- Assert that it has scrolled to Shipping Method text -->
-        <waitForElementVisible selector="{{CheckoutPaymentSection.success}}" stepKey="waitForShippingMethodTitle"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.shippingMethodTitle}}" stepKey="waitForShippingMethodTitle"/>
         <scrollTo selector="{{CheckoutPaymentSection.shippingMethodTitle}}" stepKey="scrollToShippingMethodTitle"/>
         <see selector="{{CheckoutPaymentSection.shippingMethodTitle}}" userInput="Shipping Methods" stepKey="seeShippingMethodTitle"/>
     </test>