Merge remote-tracking branch 'origin/MC-19048' into 2.2.10-develop-pr111

Author: zakdma

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

@@ -20,9 +20,11 @@
         <arguments>
             <argument name="useForPromoRule" type="string" defaultValue="Yes"/>
         </arguments>
-        <click selector="{{StorefrontPropertiesSection.storefrontPropertiesTab}}" stepKey="clickStoreFrontPropertiesTab"/>
-        <selectOption selector="{{StorefrontPropertiesSection.useForPromoRuleConditions}}" userInput="{{useForPromoRule}}" stepKey="changeOption"/>
+        <click selector="{{AdminEditAttributeStorefrontPropertiesSection.storeFrontPropertiesTab}}" stepKey="clickStoreFrontPropertiesTab"/>
+        <waitForElementVisible selector="{{AdminEditAttributeStorefrontPropertiesSection.useForPromoRuleConditions}}" stepKey="waitForUseForPromoRuleConditionsVisible"/>
+        <selectOption selector="{{AdminEditAttributeStorefrontPropertiesSection.useForPromoRuleConditions}}" userInput="{{useForPromoRule}}" stepKey="changeOption"/>
         <click selector="{{AttributePropertiesSection.save}}" stepKey="saveAttribute"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the product attribute." stepKey="successMessage"/>
     </actionGroup>
     <actionGroup name="navigateToProductAttributeByCode">

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

@@ -34,10 +34,11 @@
         <seeElement selector="{{StorefrontCategoryProductSection.productTitleByName(product.name)}}" stepKey="assertProductName"/>
         <see userInput="${{product.price}}.00" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
         <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
-        <executeInSelenium function="function($webdriver) use ($I) {
+        <!-- @TODO: This causes a parsing error after updating the magento-testing-framework to version 2.4.4 -->
+        <!--<executeInSelenium function="function($webdriver) use ($I) {
             $productName = '//main//li[.//a[contains(text(), \'' . {{product.name}} . '\' )]]//div[@data-container=\'product-grid\']';
             $I->assertEquals('2', $webdriver->findElement(\Facebook\WebDriver\WebDriverBy::xpath($productName))->getCSSValue('z-index'));
-        }" stepKey="assertProductContainerIsOpened"/>
+        }" stepKey="assertProductContainerIsOpened"/>-->
         <seeElement selector="{{StorefrontCategoryProductSection.productAddToCartByName(product.name)}}" stepKey="assertAddToCart" />
     </actionGroup>
 

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontMiniCartActionGroup.xml

@@ -12,6 +12,7 @@
         <waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
         <click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
         <seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
+        <waitForPageLoad time="30" stepKey="waitForCartPageIsLoaded"/>
     </actionGroup>
     <actionGroup name="assertOneProductNameInMiniCart">
         <arguments>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontSelectConfigurableAttributeOptionActionGroup.xml

@@ -0,0 +1,21 @@
+<?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="StorefrontSelectConfigurableAttributeOptionActionGroup">
+        <arguments>
+            <argument name="attributeLabel" type="string"/>
+            <argument name="optionValue" type="string"/>
+            <argument name="qty" type="string" defaultValue="1"/>
+        </arguments>
+        <waitForElementVisible selector="{{StorefrontProductInfoMainSection.productOptionSelect(attributeLabel)}}" stepKey="waitForOptionSelectVisible"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(attributeLabel)}}" userInput="{{optionValue}}" stepKey="selectProductOption"/>
+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{qty}}" stepKey="fillProductQuantity"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml

@@ -51,6 +51,7 @@
             <argument name="actionsAggregator" type="string" defaultValue="ANY"/>
             <argument name="actionsValue" type="string" defaultValue="FALSE"/>
             <argument name="childAttribute" type="string" defaultValue="Category"/>
+            <argument name="actionOperator" type="string" defaultValue="is"/>
             <argument name="actionValue" type="string"/>
         </arguments>
         <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickOnActionTab"/>
@@ -61,11 +62,16 @@
         <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="selectActionConditions"/>
         <waitForPageLoad stepKey="waitForDropDownOpened"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{childAttribute}}" stepKey="selectAttribute"/>
-        <waitForPageLoad stepKey="waitForOperatorOpened"/>
+        <waitForPageLoad stepKey="waitForAttributeSelected"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickOnOperator"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.operator}}" userInput="{{actionOperator}}" stepKey="selectOperator"/>
+        <!-- In case we are choosing already selected value - select is not closed automatically -->
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.condition('...')}}" dependentSelector="{{AdminCartPriceRulesFormSection.operator}}" visible="true" stepKey="closeSelect"/>
         <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption3"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.actionValue}}" userInput="{{actionValue}}" stepKey="fillActionValue"/>
         <click selector="{{AdminCartPriceRulesFormSection.applyAction}}" stepKey="applyAction"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>