Merge branch 'B2B-2106' of https://github.com/magento-arcticfoxes/magento2ce into B2B-2102

Author: rganin

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

@@ -22,9 +22,10 @@
         <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
         <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
         <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
+        <waitForPageLoad stepKey="waitForProductLoad"/>
         <fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="{{productQty}}" stepKey="fillProductQty"/>
         <scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
         <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForOptionsToLoad"/>
+        <waitForPageLoad stepKey="waitForOptionsToLoad"/>
     </actionGroup>
 </actionGroups>

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

@@ -16,9 +16,13 @@
         </arguments>
 
         <remove keyForRemoval="fillProductQty"/>
-        <waitForAjaxLoad stepKey="waitForAjaxLoad" after="selectProduct"/>
-        <fillField selector="{{AdminOrderFormCustomOptionsSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty" after="waitForAjaxLoad"/>
+        <comment userInput="BIC workaround" stepKey="waitForAjaxLoad" after="waitForProductLoad"/>
+        <waitForElementVisible selector="{{AdminOrderFormCustomOptionsSection.quantity}}" stepKey="waitForProductQty" after="waitForAjaxLoad"/>
+        <fillField selector="{{AdminOrderFormCustomOptionsSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQty" after="waitForProductQty"/>
         <attachFile selector="{{AdminOrderFormCustomOptionsSection.file}}" userInput="{{file}}" stepKey="attachImageForOptional" after="fillProductQty"/>
-        <click selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="clickButtonOK" after="attachImageForOptional"/>
+        <waitForPageLoad stepKey="waitForImageUploaded" after="attachImageForOptional"/>
+        <click selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="clickButtonOK" after="waitForImageUploaded"/>
+        <waitForPageLoad stepKey="waitForSlideOutGone" after="clickButtonOK"/>
+        <waitForElementNotVisible selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="waitForOkButtonGone" after="waitForSlideOutGone"/>
     </actionGroup>
 </actionGroups>

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

@@ -12,15 +12,19 @@
             <description>Change custom option file on admin order page.</description>
         </annotations>
         <arguments>
-            <argument name="file" type="string" defaultValue="{{TestImageNew.file}}" />
+            <argument name="file" type="string" defaultValue="{{TestImageNew.file}}"/>
         </arguments>
 
         <click selector="{{AdminOrderFormItemsSection.configure}}" stepKey="clickConfigure"/>
-        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <waitForPageLoad stepKey="waitForAjaxLoad"/>
+        <waitForElementVisible selector="{{AdminOrderFormCustomOptionsSection.linkChange}}" stepKey="waitForLinkChange"/>
         <click selector="{{AdminOrderFormCustomOptionsSection.linkChange}}" stepKey="clickLinkChange"/>
         <waitForPageLoad stepKey="waitForChangeLoad"/>
+        <waitForElementVisible selector="{{AdminOrderFormCustomOptionsSection.file}}" stepKey="waitForAttachImage"/>
         <attachFile selector="{{AdminOrderFormCustomOptionsSection.file}}" userInput="{{file}}" stepKey="changeAttachImage"/>
+        <waitForPageLoad stepKey="waitForImageUploaded"/>
         <click selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="clickButtonOK"/>
         <waitForPageLoad stepKey="waitForCustomOptionApplied"/>
+        <waitForElementNotVisible selector="{{AdminOrderFormCustomOptionsSection.buttonOk}}" stepKey="waitForOkButtonGone"/>
     </actionGroup>
 </actionGroups>

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

@@ -50,6 +50,8 @@
             <argument name="productQty" value="$simpleProduct.quantity$"/>
         </actionGroup>
         <!--Verify, admin able to change file for custom option.-->
-        <actionGroup ref="AdminChangeCustomerOptionFileActionGroup" stepKey="changeFile"/>
+        <actionGroup ref="AdminChangeCustomerOptionFileActionGroup" stepKey="changeFile">
+            <argument name="file" value="{{TestImageAdobe.file}}"/>
+        </actionGroup>
     </test>
 </tests>