Skip to content

Commit f45e7f6

Browse files
vovskyvovsky
committed
refactoring
1 parent c18d9a0 commit f45e7f6

9 files changed

+60
-43
lines changed

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminAddCmsBlockToCategoryActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminAddCmsBlockToCategory">
10+
<actionGroup name="AdminAddCmsBlockToCategoryActionGroup">
1111
<arguments>
1212
<argument name="category" defaultValue="_defaultCategory"/>
1313
<argument name="block" defaultValue="_defaultBlock"/>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminNavigateToCreateNewCMSBlockPageActionGroup.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminSetCMSBlockEnabled">
11-
<seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('0')}}" stepKey="seeBlockIsDisabled" />
12-
<click selector="{{BlockNewPageBasicFieldsSection.isActiveLabel}}" stepKey="setBlockEnabled"/>
10+
<actionGroup name="AdminNavigateToCreateNewCMSBlockPageActionGroup">
11+
<amOnPage url="{{CmsNewBlock.url}}" stepKey="navigateToCreateNewCMSBlockPage"/>
1312
</actionGroup>
1413
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCMSBlocksGridActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenCMSBlocksGridActionGroup">
11+
<amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
12+
<waitForPageLoad stepKey="waitForPageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockFromGridActionGroup.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSelectCMSBlockFromGridActionGroup">
11+
<arguments>
12+
<argument name="identifier" defaultValue=""/>
13+
</arguments>
14+
<click selector="{{BlockPageActionsSection.select(identifier)}}" stepKey="clickSelectCreatedCMSBlock" />
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSetCMSBlockDisabledActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminSetCMSBlockDisabled">
10+
<actionGroup name="AdminSetCMSBlockDisabledActionGroup">
1111
<seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('1')}}" stepKey="seeBlockIsEnabled" />
1212
<click selector="{{BlockNewPageBasicFieldsSection.isActiveLabel}}" stepKey="setBlockDisabled"/>
1313
</actionGroup>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSetCMSBlockEnabledActionGroup.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminNavigateToCreateNewCMSBlockPage">
11-
<amOnPage url="{{CmsNewBlock.url}}" stepKey="navigateToCreateNewCMSBlockPage"/>
10+
<actionGroup name="AdminSetCMSBlockEnabledActionGroup">
11+
<seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('0')}}" stepKey="seeBlockIsDisabled" />
12+
<click selector="{{BlockNewPageBasicFieldsSection.isActiveLabel}}" stepKey="setBlockEnabled"/>
1213
</actionGroup>
1314
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertCMSBlockInGridActionGroup.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCreateDisabledCmsBlockEntityAndAssignToCategoryTest.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,23 @@
2929
<actionGroup ref="logout" stepKey="logout"/>
3030
</after>
3131

32-
<actionGroup ref="AdminNavigateToCreateNewCMSBlockPage" stepKey="navigateToCreateNewCMSBlockPage"/>
32+
<actionGroup ref="AdminNavigateToCreateNewCMSBlockPageActionGroup" stepKey="navigateToCreateNewCMSBlockPage"/>
3333
<actionGroup ref="FillOutBlockContent" stepKey="fillOutBlockContent"/>
34-
<actionGroup ref="AdminSetCMSBlockDisabled" stepKey="disableBlock"/>
34+
<actionGroup ref="AdminSetCMSBlockDisabledActionGroup" stepKey="disableBlock"/>
3535
<actionGroup ref="saveCMSBlock" stepKey="saveCMSBlock"/>
36-
<actionGroup ref="AssertCMSBlockInGrid" stepKey="assertCMSBlockInGrid">
37-
<argument name="CMSBlockPage" value="_defaultBlock"/>
36+
37+
<actionGroup ref="AdminOpenCMSBlocksGridActionGroup" stepKey="openCMSBlocksGrid"/>
38+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilters"/>
39+
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescending"/>
40+
<actionGroup ref="AdminSelectCMSBlockFromGridActionGroup" stepKey="verifyBlockInGrid">
41+
<argument name="identifier" value="_defaultBlock.identifier"/>
3842
</actionGroup>
39-
<actionGroup ref="AdminAddCmsBlockToCategory" stepKey="addCmsBlockToCategory">
43+
44+
<actionGroup ref="AdminAddCmsBlockToCategoryActionGroup" stepKey="addCmsBlockToCategory">
4045
<argument name="category" value="$$newDefaultCategory$$"/>
4146
</actionGroup>
42-
<actionGroup ref="AssertNoTextOnCategoryFrontPage" stepKey="assertBlockOnCategoryFrontPage">
47+
48+
<actionGroup ref="AssertNoTextOnCategoryFrontPageActionGroup" stepKey="assertBlockOnCategoryFrontPage">
4349
<argument name="category" value="$$newDefaultCategory$$"/>
4450
<argument name="text" value="{{_defaultBlock.content}}"/>
4551
</actionGroup>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminCreateEnabledCmsBlockEntityAndAssignToCategoryTest.xml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,22 @@
2929
<actionGroup ref="logout" stepKey="logout"/>
3030
</after>
3131

32-
<actionGroup ref="AdminNavigateToCreateNewCMSBlockPage" stepKey="navigateToCreateNewCMSBlockPage"/>
32+
<actionGroup ref="AdminNavigateToCreateNewCMSBlockPageActionGroup" stepKey="navigateToCreateNewCMSBlockPage"/>
3333
<actionGroup ref="FillOutBlockContent" stepKey="fillOutBlockContent"/>
3434
<actionGroup ref="saveCMSBlock" stepKey="saveCMSBlock"/>
35-
<actionGroup ref="AssertCMSBlockInGrid" stepKey="assertCMSBlockInGrid">
36-
<argument name="CMSBlockPage" value="_defaultBlock"/>
35+
36+
<actionGroup ref="AdminOpenCMSBlocksGridActionGroup" stepKey="openCMSBlocksGrid"/>
37+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilters"/>
38+
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescending"/>
39+
<actionGroup ref="AdminSelectCMSBlockFromGridActionGroup" stepKey="verifyBlockInGrid">
40+
<argument name="identifier" value="_defaultBlock.identifier"/>
3741
</actionGroup>
38-
<actionGroup ref="AdminAddCmsBlockToCategory" stepKey="addCmsBlockToCategory">
42+
43+
<actionGroup ref="AdminAddCmsBlockToCategoryActionGroup" stepKey="addCmsBlockToCategory">
3944
<argument name="category" value="$$newDefaultCategory$$"/>
4045
</actionGroup>
41-
<actionGroup ref="AssertTextOnCategoryFrontPage" stepKey="assertBlockOnCategoryFrontPage">
46+
47+
<actionGroup ref="AssertTextOnCategoryFronPageActionGroup" stepKey="assertBlockOnCategoryFrontPage">
4248
<argument name="category" value="$$newDefaultCategory$$"/>
4349
<argument name="text" value="{{_defaultBlock.content}}"/>
4450
</actionGroup>

0 commit comments

Comments
 (0)