MC-19050: [Test Failed]: Magento\FunctionalTestingFramework.functional.AdminReorderWithCatalogPriceTest

Author: zakdma

app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml

@@ -15,26 +15,27 @@
         </arguments>
         <!-- Go to the admin Catalog rule grid and add a new one -->
         <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad time="30" stepKey="waitForPageFullyLoaded"/>
         <click selector="{{AdminMainActionsSection.add}}" stepKey="addNewRule"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
 
         <!-- Fill the form according the attributes of the entity -->
+        <waitForElementVisible selector="{{AdminCatalogPriceRuleSection.ruleName}}" stepKey="waitRuleNameFieldAppears"/>
         <fillField selector="{{AdminCatalogPriceRuleSection.ruleName}}" userInput="{{catalogRule.name}}" stepKey="fillName"/>
         <fillField selector="{{AdminCatalogPriceRuleSection.description}}" userInput="{{catalogRule.description}}" stepKey="fillDescription"/>
         <selectOption selector="{{AdminCatalogPriceRuleSection.websites}}" parameterArray="{{catalogRule.websites}}" stepKey="selectWebsites"/>
         <selectOption selector="{{AdminCatalogPriceRuleSection.customerGroups}}" parameterArray="{{catalogRule.groups}}" stepKey="selectCustomerGroups"/>
 
-        <click selector="{{AdminCatalogPriceRuleSection.actionsTab}}" stepKey="openActionDropdown"/>
+        <scrollTo selector="{{AdminCatalogPriceRuleSection.actionsTabTitle}}" stepKey="scrollToActionsSection"/>
+        <conditionalClick selector="{{AdminCatalogPriceRuleSection.actionsTabTitle}}" dependentSelector="{{AdminCatalogPriceRuleSection.actionsTabBody}}" visible="false" stepKey="openActionsTabIfCollapsed"/>
         <selectOption selector="{{AdminCatalogPriceRuleActionsSection.apply}}" userInput="{{catalogRule.simple_action}}" stepKey="discountType"/>
         <fillField selector="{{AdminCatalogPriceRuleActionsSection.discountAmount}}" userInput="{{catalogRule.discount_amount}}" stepKey="fillDiscountValue"/>
         <selectOption selector="{{AdminCatalogPriceRuleActionsSection.disregardRules}}" userInput="Yes" stepKey="discardSubsequentRules"/>
 
         <!-- Scroll to top and either save or save and apply after the action group -->
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
-        <waitForPageLoad stepKey="waitForRuleSaved"/>
-        <see userInput="You saved the rule." stepKey="verifyRuleSaved"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the rule." stepKey="checkSuccessMessage"/>
     </actionGroup>
 
     <actionGroup name="RemoveCatalogPriceRule">
@@ -48,13 +49,12 @@
         <fillField selector="{{AdminCatalogPriceRuleGridSection.filterByRuleName}}" userInput="{{ruleName}}" stepKey="filterByRuleName"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
         <click selector="{{AdminGridTableSection.row('1')}}" stepKey="clickEdit"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
-
+        <waitForPageLoad stepKey="waitForEditRuleFormLoad"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.delete}}" stepKey="waitDeleteButtonAppears"/>
         <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickToDelete"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForElementVisible"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickToConfirm"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="checkSuccessMessage"/>
     </actionGroup>

app/code/Magento/CatalogRule/Test/Mftf/Data/CatalogRuleData.xml

@@ -47,4 +47,16 @@
         <data key="simple_action">to_percent</data>
         <data key="discount_amount">90</data>
     </entity>
+    <entity name="CatalogRuleToPercent90" type="catalogRule">
+        <data key="name" unique="suffix">CatalogPriceRule</data>
+        <data key="description">Catalog Price Rule Description</data>
+        <array key="groups">
+            <item>NOT LOGGED IN</item>
+        </array>
+        <array key="websites">
+            <item>Main Website</item>
+        </array>
+        <data key="simple_action">Adjust final price to this percentage</data>
+        <data key="discount_amount">90</data>
+    </entity>
 </entities>

app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleSection.xml

@@ -27,5 +27,7 @@
         <element name="priority" type="input" selector="[name='sort_order']"/>
         <element name="conditionsTab" type="block" selector="[data-index='block_promo_catalog_edit_tab_conditions']"/>
         <element name="actionsTab" type="block" selector="[data-index='actions']"/>
+        <element name="actionsTabTitle" type="block" selector="[data-index='actions'] .fieldset-wrapper-title"/>
+        <element name="actionsTabBody" type="block" selector="[data-index='actions'] .admin__fieldset-wrapper-content"/>
     </section>
 </sections>

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

@@ -44,12 +44,9 @@
         <after>
             <deleteData createDataKey="createSimpleProductApi" stepKey="deleteSimpleProductApi"/>
             <!-- Delete the rule -->
-            <actionGroup ref="RemoveCatalogPriceRule" stepKey="deletePriceRule">
-                <argument name="ruleName" value="CatalogRuleToPercent.name" />
-            </actionGroup>
+            <actionGroup ref="deleteAllCatalogPriceRule" stepKey="removeAllExistingCartPriceRules"/>
 
             <!--Clear all filters in grid-->
-            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetCatalogRuleGridFilters"/>
             <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
             <actionGroup ref="logout" stepKey="logout"/>