Merge branch 'magento-commerce:develop' into ACP2E-2123

Author: o-iegorov

InventoryCatalogAdminUi/Test/Mftf/Test/AdminCreateOrderWithSimpleProductFromDefaultSourceWithBackordersTest.xml

@@ -98,6 +98,7 @@
         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
         <waitForPageLoad stepKey="waitForGuestCheckoutPageLoad"/>
+        <waitForElementVisible selector="{{CheckoutShippingGuestInfoSection.email}}" stepKey="waitForEmailFieldVisible" />
         <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>

InventoryCatalogAdminUi/Test/Mftf/Test/AdminCreateOrderWithSimpleProductInSingleStockModeWithBackordersTest.xml

@@ -82,6 +82,7 @@
         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
         <waitForPageLoad stepKey="waitForGuestCheckoutPageLoad"/>
+        <waitForElementVisible selector="{{CheckoutShippingGuestInfoSection.email}}" stepKey="waitForEmailField" />
         <fillField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>

InventoryInStorePickupFrontend/Test/Mftf/ActionGroup/StorefrontPickInStoreFillCustomerEmailActionGroup.xml

@@ -16,6 +16,7 @@
         </arguments>
         <seeInCurrentUrl url="checkout/#shipping" stepKey="checkUrlFormKey"/>
         <waitForPageLoad time="30" stepKey="waitForPageRefresh"/>
+        <waitForElementVisible selector="{{StorefrontSelectStoreSection.customerEmailField}}" stepKey="waitForEmailFieldVisible" />
         <fillField selector="{{StorefrontSelectStoreSection.customerEmailField}}" userInput="{{email}}" stepKey="fillCustomerEmail"/>
     </actionGroup>
 </actionGroups>

InventoryInStorePickupFrontend/Test/Mftf/ActionGroup/StorefrontPickInStoreGuestCustomerFillBillingAddressActionGroup.xml

@@ -11,6 +11,7 @@
         <annotations>
             <description>Fill guest customer billing address for store pickup shipping method.</description>
         </annotations>
+        <remove keyForRemoval="waitForEmailField"/>
         <remove keyForRemoval="enterEmail"/>
         <click selector="{{CheckoutPaymentSection.update}}" stepKey="updateAddress"/>
         <waitForLoadingMaskToDisappear stepKey="waitForAddressUpdate"/>

InventorySwatchesFrontendUi/Test/Mftf/Test/StorefrontValidateVisualSwatchAbsenceOfAttributeWhenProductStocksOutTest.xml

@@ -78,7 +78,7 @@
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory.name$$]" stepKey="fillCategory"/>
         <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="openConfigurationPanel"/>
-        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForSlideOut"/>
+        <waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForSlideOut"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickCreateNewAttribute"/>
         <waitForPageLoad stepKey="waitForIFrame"/>
         <!--Create a new attribute with visual swatches options-->