Skip to content

Commit 1c47c68

Browse files
committed
MAGETWO-87577: Build stabilization
- Added ClearAll before descending sort
1 parent 5116d7a commit 1c47c68

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/AssignBlockToCMSPageActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
</arguments>
1515
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
1616
<waitForPageLoad stepKey="waitForPageLoad1"/>
17+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
18+
<waitForPageLoad stepKey="waitForGridReload"/>
1719
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending1" visible="true"/>
1820
<waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish1" />
1921
<!-- Conditional Click again in case it goes from default state to ascending on first click -->

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/CMSActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</arguments>
1414
<amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
1515
<waitForPageLoad stepKey="waitForPageLoad1"/>
16-
<conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
16+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
1717
<waitForPageLoad stepKey="waitForPageLoad2"/>
1818
<conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" stepKey="clickToAttemptSortByIdDescending" visible="true"/>
1919
<waitForLoadingMaskToDisappear stepKey="waitForFirstIdSortDescendingToFinish" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
7979
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
8080
<waitForPageLoad stepKey="waitForPageLoad7"/>
81-
<conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter1" visible="true"/>
81+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter1" visible="true"/>
8282
<waitForPageLoad stepKey="waitForFilterReload"/>
8383
<click selector="{{CmsPagesPageActionsSection.FilterBtn}}" stepKey="clickFiltersBtn" />
8484
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillOutURLKey" />
@@ -130,7 +130,7 @@
130130
<after>
131131
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
132132
<waitForPageLoad stepKey="waitForPageLoad2"/>
133-
<conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
133+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
134134
<waitForPageLoad stepKey="waitForGridReload"/>
135135
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
136136
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<description value="Admin should be able to add widget to WYSIWYG content Block"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-84654"/>
19-
<group value="skip" />
2019
</annotations>
2120
<before>
2221
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
@@ -84,7 +83,7 @@
8483
<after>
8584
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
8685
<waitForPageLoad stepKey="waitForPageLoad2"/>
87-
<conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
86+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
8887
<waitForPageLoad stepKey="waitForGridReload"/>
8988
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
9089
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
4242
<amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
4343
<waitForPageLoad stepKey="waitForPageLoad2"/>
44-
<conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
44+
<conditionalClick selector="{{CmsPagesPageActionsSection.clearAll}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
4545
<waitForPageLoad stepKey="waitForGridReload"/>
4646
<click selector="{{CmsPagesPageActionsSection.FilterBtn}}" stepKey="clickFiltersBtn" />
4747
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="$$createPreReqCMSPage.identifier$$" stepKey="fillOutURLKey" />

0 commit comments

Comments
 (0)