Skip to content

Commit 2421220

Browse files
vovskyvovsky
committed
refactored according best practices
1 parent 3872596 commit 2421220

File tree

6 files changed

+103
-29
lines changed

6 files changed

+103
-29
lines changed

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCMSPageSetDisabledActionGroup.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="AdminCMSPageSetDisabled">
11+
<seeElement selector="{{CmsNewPagePageBasicFieldsSection.isActive('1')}}" stepKey="seePageIsEnabled" />
12+
<click selector="{{CmsNewPagePageBasicFieldsSection.isActiveLabel}}" stepKey="setPageDisabled"/>
13+
</actionGroup>
14+
</actionGroups>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AssertCMSPageNotFoundOnFront">
11+
<arguments>
12+
<argument name="identifier" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{StorefrontHomePage.url}}/{{identifier}}" stepKey="amOnPageOnFrontend"/>
15+
<waitForPageLoad stepKey="waitForPageLoadOnFrontend"/>
16+
<see userInput="Whoops, our bad..." stepKey="seePageErrorForFirstPage"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/StorefrontCMSPageNavigateToPageActionGroup.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="StorefrontCMSPageNavigateToPage">
11+
<arguments>
12+
<argument name="identifier" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{StorefrontHomePage.url}}/{{identifier}}" stepKey="amOnCmsPageOnStorefront"/>
15+
</actionGroup>
16+
</actionGroups>

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
*CreateNewPage Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCmsPageUpdateAndDisableTest">
12+
<annotations>
13+
<features value="Cms"/>
14+
<title value="Update CMS Page via the Admin, disable"/>
15+
<description value="Admin should be able to update a CMS Page"/>
16+
<group value="backend"/>
17+
<group value="cMSContent"/>
18+
<group value="mtf_migrated"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
22+
<createData entity="_defaultCmsPage" stepKey="existingCMSPage" />
23+
</before>
24+
<after>
25+
<deleteData createDataKey="existingCMSPage" stepKey="deleteCMSPage" />
26+
<actionGroup ref="logout" stepKey="logout"/>
27+
</after>
28+
<!--Navigate to Page in Admin-->
29+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
30+
<argument name="CMSPage" value="$$existingCMSPage$$"/>
31+
</actionGroup>
32+
<!--Fill data using _duplicatedCMSPage-->
33+
<actionGroup ref="FillOutCMSPageContent" stepKey="fillNewData"/>
34+
<!--Deactivate page-->
35+
<actionGroup ref="AdminCMSPageSetDisabled" stepKey="disablePage"/>
36+
<!--Save page-->
37+
<actionGroup ref="saveCmsPage" stepKey="saveDeactivatedPage"/>
38+
<!--Check that page is not found on frontend-->
39+
<actionGroup ref="AssertCMSPageNotFoundOnFront" stepKey="checkPageIsDisabledOnStorefront">
40+
<argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
41+
</actionGroup>
42+
</test>
43+
</tests>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminUpdateCmsPageEntityTest.xml renamed to ‎app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageUpdateTest.xml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminUpdateCmsPageEntityTest">
11+
<test name="AdminCmsPageUpdateTest">
1212
<annotations>
1313
<features value="Cms"/>
1414
<title value="Update CMS Page via the Admin"/>
@@ -19,43 +19,28 @@
1919
</annotations>
2020
<before>
2121
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
22-
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
22+
<createData entity="_defaultCmsPage" stepKey="existingCMSPage" />
2323
</before>
2424
<after>
25-
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" />
25+
<deleteData createDataKey="existingCMSPage" stepKey="deleteCMSPage" />
2626
<actionGroup ref="logout" stepKey="logout"/>
2727
</after>
28-
<!--Update page, deactivate-->
2928
<!--Navigate to Page in Admin-->
3029
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
31-
<argument name="CMSPage" value="$$createCMSPage$$"/>
30+
<argument name="CMSPage" value="$$existingCMSPage$$"/>
3231
</actionGroup>
3332
<!--Fill data using _duplicatedCMSPage-->
3433
<actionGroup ref="FillOutCMSPageContent" stepKey="fillNewData"/>
35-
<!--Deactivate page-->
36-
<seeElement selector="{{CmsNewPagePageBasicFieldsSection.isActive('1')}}" stepKey="seePageIsEnabled" />
37-
<click selector="{{CmsNewPagePageBasicFieldsSection.isActiveLabel}}" stepKey="setPageNotActive"/>
38-
<!--Save page-->
39-
<actionGroup ref="saveCmsPage" stepKey="saveDeactivatedPage"/>
40-
<!--Check that page is not found on frontend-->
41-
<amOnPage url="{{StorefrontHomePage.url}}/{{_duplicatedCMSPage.identifier}}" stepKey="amOnDeactivatedPageOnFrontend"/>
42-
<waitForPageLoad stepKey="waitForDeactivatedPageLoadOnFrontend"/>
43-
<see userInput="Whoops, our bad..." stepKey="seePageError"/>
44-
<!--Check page data is updated properly-->
45-
<!--Navigate to Page in Admin-->
46-
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToUpdatedCMSPageInAdmin">
34+
<actionGroup ref="saveCmsPage" stepKey="saveActivatedPage"/>
35+
<!--Verify data in admin-->
36+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToUpdatedCMSPage">
4737
<argument name="CMSPage" value="_duplicatedCMSPage"/>
4838
</actionGroup>
49-
<!--Verify data in admin-->
5039
<actionGroup ref="AssertCMSPageContent" stepKey="verifyPageDataInAdmin"/>
51-
<!--Activate page-->
52-
<seeElement selector="{{CmsNewPagePageBasicFieldsSection.isActive('0')}}" stepKey="seePageIsDisabled" />
53-
<click selector="{{CmsNewPagePageBasicFieldsSection.isActiveLabel}}" stepKey="setPageActive"/>
54-
<actionGroup ref="saveCmsPage" stepKey="saveActivatedPage"/>
55-
<!--Flush cache-->
56-
<magentoCLI command="cache:flush" stepKey="flushCache"/>
5740
<!--Verify data on frontend-->
58-
<amOnPage url="{{StorefrontHomePage.url}}/{{_duplicatedCMSPage.identifier}}" stepKey="amOnPageTestPage"/>
41+
<actionGroup ref="StorefrontCMSPageNavigateToPage" stepKey="navigateToPageOnStorefront">
42+
<argument name="identifier" value="{{_duplicatedCMSPage.identifier}}"/>
43+
</actionGroup>
5944
<actionGroup ref="AssertStoreFrontCMSPage" stepKey="verifyPageDataOnFrontend">
6045
<argument name="cmsTitle" value="{{_duplicatedCMSPage.title}}"/>
6146
<argument name="cmsContent" value="{{_duplicatedCMSPage.content}}"/>

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,19 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Cms\Test\TestCase\UpdateCmsPageEntityTest" summary="Update Cms Page" ticketId="MAGETWO-25186">
1010
<variation name="UpdateCmsPageEntityTestVariation1">
11-
<data name="tag" xsi:type="string">severity:S3</data>
11+
<data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
1212
<data name="cms/data/title" xsi:type="string">CmsPageEdited%isolation%</data>
1313
<data name="cms/data/is_active" xsi:type="string">No</data>
1414
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content_after_edit</data>
15-
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1615
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
1716
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageDisabledOnFrontend" />
1817
</variation>
1918
<variation name="UpdateCmsPageEntityTestVariation2">
20-
<data name="tag" xsi:type="string">severity:S1</data>
19+
<data name="tag" xsi:type="string">severity:S1, mftf_migrated:yes</data>
2120
<data name="cms/data/title" xsi:type="string">CmsPageEdited%isolation%</data>
2221
<data name="cms/data/identifier" xsi:type="string">cms_page_url_edited_%isolation%</data>
2322
<data name="cms/data/content_heading" xsi:type="string">Content Heading TextEdited</data>
2423
<data name="cms/data/content/content" xsi:type="string">cms_page_text_content_after_edit</data>
25-
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
2624
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageSuccessSaveMessage" />
2725
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPageForm" />
2826
<constraint name="Magento\Cms\Test\Constraint\AssertCmsPagePreview" />

0 commit comments

Comments
 (0)