added check after provideCommentStep

changed click Get shipping methods to conditional one

Author: AnnaAPak

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFlatRateShippingMethodOnCreateOrderPageActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSelectFlatRateShippingMethodOnCreateOrderPageActionGroup" extends="AdminSelectFlatRateShippingMethodActionGroup">
+        <annotations>
+            <description>Clicks the Get shipping methods and rates link if it is displayed and Selects the Flat Rate Shipping Method</description>
+        </annotations>
+        <remove keyForRemoval="openShippingMethod"/>
+        <conditionalClick selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" dependentSelector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" visible="true" stepKey="openShippingMethodIfCollapsed" before="waitForShippingMethods"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithCheckedAppendCommentCheckboxTest.xml

@@ -42,10 +42,10 @@
         <actionGroup ref="AdminAddCommentOnCreateOrderPageActionGroup" stepKey="provideComment">
             <argument name="comment" value="Test Order Comment"/>
         </actionGroup>
-        <scrollTo selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="scrollToShipping"/> 
+        <seeCheckboxIsChecked selector="{{AdminOrderFormTotalSection.appendComments}}" stepKey="checkAppendCommentsCheckboxIsCheckedAfterCommentProvided"/>
         <actionGroup ref="SelectCheckMoneyPaymentMethodActionGroup" stepKey="selectPaymentMethod"/>
-        <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRate"/>
-        <seeCheckboxIsChecked selector="{{AdminOrderFormTotalSection.appendComments}}" stepKey="checkAppendCommentsCheckboxIsChecked"/>
+        <actionGroup ref="AdminSelectFlatRateShippingMethodOnCreateOrderPageActionGroup" stepKey="selectFlatRate"/>
+        <seeCheckboxIsChecked selector="{{AdminOrderFormTotalSection.appendComments}}" stepKey="checkAppendCommentsCheckboxIsCheckedAfterShippingSelected"/>
         <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
         <actionGroup ref="AdminCheckIfCustomerIsNotifiedOfOrderCommentActionGroup" stepKey="assertCustomerIsNotified">
             <argument name="orderComment" value="Test Order Comment"/>