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

Author: rganin

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AddProductWithQtyToCartFromStorefrontProductPageActionGroup.xml

@@ -17,6 +17,7 @@
             <argument name="productQty" type="string"/>
         </arguments>
 
-        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQuantity" before="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.quantity}}" stepKey="waitForProductQuantity" before="fillProductQuantity"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="{{productQty}}" stepKey="fillProductQuantity" before="waitForAddToCartButton"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndCheckoutItemsCountTest/StorefrontCartItemsCountDisplayItemsQuantitiesTest.xml

@@ -32,13 +32,17 @@
         </after>
 
         <!--  Add simpleProduct1 to cart -->
-        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct1.custom_attributes[url_key]$)}}" stepKey="amOnProduct1Page"/>
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="amOnProduct1Page">
+            <argument name="product" value="$simpleProduct1$"/>
+        </actionGroup>
         <actionGroup ref="AddProductWithQtyToCartFromStorefrontProductPageActionGroup" stepKey="addProduct1ToCart">
             <argument name="productName" value="$$simpleProduct1.name$$"/>
             <argument name="productQty" value="2"/>
         </actionGroup>
         <!--  Add simpleProduct2 to cart -->
-        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct2.custom_attributes[url_key]$)}}" stepKey="amOnProduct2Page"/>
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="amOnProduct2Page">
+            <argument name="product" value="$simpleProduct2$"/>
+        </actionGroup>
         <actionGroup ref="AddProductWithQtyToCartFromStorefrontProductPageActionGroup" stepKey="addProduct2ToCart">
             <argument name="productName" value="$$simpleProduct2.name$$"/>
             <argument name="productQty" value="1"/>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AttachImageActionGroup.xml

@@ -17,9 +17,10 @@
             <argument name="Image"/>
         </arguments>
 
+        <waitForElement selector="{{MediaGallerySection.BrowseUploadImage}}" stepKey="waitForUploadImageElement"/>
         <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{Image.value}}" stepKey="uploadImage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
         <waitForElementVisible  selector="{{MediaGallerySection.imageOrImageCopy(Image.fileName, Image.extension)}}" stepKey="waitForUploadImage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/SaveImageActionGroup.xml

@@ -13,8 +13,10 @@
             <description>Clicks on Insert File in the Media Gallery.</description>
         </annotations>
 
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible selector="{{MediaGallerySection.InsertFile}}" stepKey="waitForInsertBtn"/>
         <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/StorefrontSwitchCurrencyActionGroup.xml

@@ -15,6 +15,8 @@
         <click selector="{{StorefrontSwitchCurrencyRatesSection.currencyToggle}}" stepKey="openToggle"/>
         <waitForElementVisible selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="waitForCurrency"/>
         <click selector="{{StorefrontSwitchCurrencyRatesSection.currency(currency)}}" stepKey="chooseCurrency"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" stepKey="waitForSelectedCurrency"/>
         <see selector="{{StorefrontSwitchCurrencyRatesSection.selectedCurrency}}" userInput="{{currency}}" stepKey="seeSelectedCurrency"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminOrderRateDisplayWhenChooseThreeAllowedCurrenciesTest.xml

@@ -43,8 +43,10 @@
             <argument name="rate" value="0.8"/>
         </actionGroup>
         <!--Open created product on Storefront and place for order-->
-        <amOnPage url="{{StorefrontProductPage.url($$createNewProduct.custom_attributes[url_key]$$)}}" stepKey="goToNewProductPage"/>
-        <waitForPageLoad stepKey="waitForNewProductPagePageLoad"/>
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="goToNewProductPage">
+            <argument name="product" value="$createNewProduct$"/>
+        </actionGroup>
+        <comment userInput="BIC workaround" stepKey="waitForNewProductPagePageLoad"/>
         <actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchCurrency">
             <argument name="currency" value="RUB"/>
         </actionGroup>