Skip to content

Commit 799dd70

Browse files
committed
MAGETWO-87577: Build stabilization
- Added clear filter to <after>
1 parent f061c73 commit 799dd70

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@
1818
<element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
1919
<element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
2020
<element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Preview']" parameterized="true"/>
21+
<element name="clearAll" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
22+
<element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
2123
</section>
2224
</sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddImageToWYSIWYGBlockCest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
4949
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
5050
<waitForPageLoad stepKey="waitForPageLoad6"/>
51+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
52+
<waitForPageLoad stepKey="waitForGridReload"/>
5153
<click selector="{{CmsPagesPageActionsSection.FilterBtn}}" stepKey="clickFiltersBtn" />
5254
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillOutURLKey" />
5355
<click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />
@@ -83,6 +85,10 @@
8385
<!--see image on Storefront-->
8486
<seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
8587
<after>
88+
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
89+
<waitForPageLoad stepKey="waitForPageLoad"/>
90+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
91+
<waitForPageLoad stepKey="waitForGridReload"/>
8692
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
8793
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
8894
<actionGroup ref="logout" stepKey="logout"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminAddWidgetToWYSIWYGBlockCest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
4848
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
4949
<waitForPageLoad stepKey="waitForPageLoad3"/>
50+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
51+
<waitForPageLoad stepKey="waitForGridReload"/>
5052
<click selector="{{CmsPagesPageActionsSection.FilterBtn}}" stepKey="clickFiltersBtn" />
5153
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillOutURLKey" />
5254
<click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />

0 commit comments

Comments
 (0)