Skip to content

Commit b80e6f6

Browse files
slavvkaslavvka
authored
ENGCOM-6838: Module_Cms MFTF test improvements #26782 
2 parents eef1364 + 718a44d commit b80e6f6

File tree

3 files changed

+96
-71
lines changed

3 files changed

+96
-71
lines changed

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest">
12+
<annotations>
13+
<features value="Cms"/>
14+
<stories value="Default layout configuration MAGETWO-88793"/>
15+
<title value="Admin should be able to configure the default layout for CMS Page from System Configuration"/>
16+
<description value="Admin should be able to configure the default layout for CMS Page from System Configuration"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MAGETWO-89025"/>
19+
<group value="Cms"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
26+
<actionGroup ref="logout" stepKey="logout"/>
27+
</after>
28+
<amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
29+
<waitForPageLoad stepKey="waitForPageLoad"/>
30+
<conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
31+
<waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="DefaultProductLayout" />
32+
<seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="seeOneColumnSelected" />
33+
<seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected1" />
34+
<seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected2" />
35+
<selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="2 columns with right bar" stepKey="selectColumnsWithRightBar"/>
36+
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
37+
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPagePagesGrid"/>
38+
<waitForPageLoad stepKey="waitForPageLoad1"/>
39+
<waitForLoadingMaskToDisappear stepKey="wait2" />
40+
<click selector="{{CmsDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
41+
<waitForElementVisible selector="{{CmsDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
42+
<seeOptionIsSelected selector="{{CmsDesignSection.LayoutDropdown}}" userInput="2 columns with right bar" stepKey="seeColumnsWithRightBar" />
43+
</test>
44+
</tests>

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

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -29,76 +29,8 @@
2929
<actionGroup ref="CreateNewPageWithBasicValues" stepKey="createNewPageWithBasicValues" />
3030
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSaveCmsPageButton" />
3131
<actionGroup ref="VerifyCreatedCmsPage" stepKey="verifyCmsPage" />
32-
</test>
33-
<test name="AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest">
34-
<annotations>
35-
<features value="Cms"/>
36-
<stories value="Default layout configuration MAGETWO-88793"/>
37-
<title value="Admin should be able to configure the default layout for CMS Page from System Configuration"/>
38-
<description value="Admin should be able to configure the default layout for CMS Page from System Configuration"/>
39-
<severity value="CRITICAL"/>
40-
<testCaseId value="MAGETWO-89025"/>
41-
<group value="Cms"/>
42-
</annotations>
43-
<before>
44-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
45-
</before>
46-
<after>
47-
<actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
48-
<actionGroup ref="logout" stepKey="logout"/>
49-
</after>
50-
<amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
51-
<waitForPageLoad stepKey="waitForPageLoad"/>
52-
<conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
53-
<waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="DefaultProductLayout" />
54-
<seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="seeOneColumnSelected" />
55-
<seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected1" />
56-
<seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected2" />
57-
<selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="2 columns with right bar" stepKey="selectColumnsWithRightBar"/>
58-
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
59-
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPagePagesGrid"/>
60-
<waitForPageLoad stepKey="waitForPageLoad1"/>
61-
<waitForLoadingMaskToDisappear stepKey="wait2" />
62-
<click selector="{{CmsDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
63-
<waitForElementVisible selector="{{CmsDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
64-
<seeOptionIsSelected selector="{{CmsDesignSection.LayoutDropdown}}" userInput="2 columns with right bar" stepKey="seeColumnsWithRightBar" />
65-
</test>
66-
<test name="AdminCreateDuplicatedCmsPageTest">
67-
<annotations>
68-
<features value="Cms"/>
69-
<stories value="CMS Page Duplication and Reset Removal MAGETWO-87096"/>
70-
<title value="Admin should be able to duplicate a CMS Page"/>
71-
<description value="Admin should be able to duplicate a CMS Page"/>
72-
<severity value="CRITICAL"/>
73-
<testCaseId value="MAGETWO-89184"/>
74-
<group value="Cms"/>
75-
</annotations>
76-
<before>
77-
<actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
78-
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
79-
</before>
80-
<after>
81-
<actionGroup ref="logout" stepKey="logout"/>
82-
</after>
83-
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPageCreationForm"/>
84-
<waitForPageLoad stepKey="waitForPageLoad1"/>
85-
<!--Verify Save&Duplicate button and Save&Close button-->
86-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn1" />
87-
<see selector="{{CmsNewPagePageActionsSection.saveAndDuplicate}}" userInput="Save &amp; Duplicate" stepKey="seeSaveAndDuplicate"/>
88-
<see selector="{{CmsNewPagePageActionsSection.saveAndClose}}" userInput="Save &amp; Close" stepKey="seeSaveAndClose"/>
89-
<!--Create new CMS Page page-->
90-
<actionGroup ref="FillOutCMSPageContent" stepKey="FillOutBlockContent"/>
91-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn2" />
92-
<click selector="{{CmsNewPagePageActionsSection.saveAndDuplicate}}" stepKey="clickSaveAndDuplicate" />
93-
<waitForPageLoad stepKey="waitForPageLoad3"/>
94-
<see userInput="You saved the page." stepKey="seeSavedPageMsgOnForm"/>
95-
<see userInput="You duplicated the page." stepKey="seeDuplicatedPageMsg"/>
96-
<!--Verify duplicated CMS Page-->
97-
<seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('0')}}" stepKey="seeBlockNotEnable" />
98-
<actionGroup ref="AssertCMSPageContentActionGroup" stepKey="assertContent"/>
99-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn3" />
100-
<click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
101-
<see userInput="You saved the page." stepKey="seeSavedCMSPageMsgOnGrid"/>
102-
<seeElement selector="div[data-role='grid-wrapper']" stepKey="seeGridPage" />
32+
<actionGroup ref="DeletePageByUrlKeyActionGroup" stepKey="deletePage">
33+
<argument name="UrlKey" value="{{_defaultCmsPage.identifier}}"/>
34+
</actionGroup>
10335
</test>
10436
</tests>

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCreateDuplicatedCmsPageTest">
12+
<annotations>
13+
<features value="Cms"/>
14+
<stories value="CMS Page Duplication and Reset Removal MAGETWO-87096"/>
15+
<title value="Admin should be able to duplicate a CMS Page"/>
16+
<description value="Admin should be able to duplicate a CMS Page"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MAGETWO-89184"/>
19+
<group value="Cms"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
23+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="logout" stepKey="logout"/>
27+
</after>
28+
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPageCreationForm"/>
29+
<waitForPageLoad stepKey="waitForPageLoad1"/>
30+
<!--Verify Save&Duplicate button and Save&Close button-->
31+
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn1" />
32+
<see selector="{{CmsNewPagePageActionsSection.saveAndDuplicate}}" userInput="Save &amp; Duplicate" stepKey="seeSaveAndDuplicate"/>
33+
<see selector="{{CmsNewPagePageActionsSection.saveAndClose}}" userInput="Save &amp; Close" stepKey="seeSaveAndClose"/>
34+
<!--Create new CMS Page page-->
35+
<actionGroup ref="FillOutCMSPageContent" stepKey="FillOutBlockContent"/>
36+
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn2" />
37+
<click selector="{{CmsNewPagePageActionsSection.saveAndDuplicate}}" stepKey="clickSaveAndDuplicate" />
38+
<waitForPageLoad stepKey="waitForPageLoad3"/>
39+
<see userInput="You saved the page." stepKey="seeSavedPageMsgOnForm"/>
40+
<see userInput="You duplicated the page." stepKey="seeDuplicatedPageMsg"/>
41+
<!--Verify duplicated CMS Page-->
42+
<seeElement selector="{{BlockNewPageBasicFieldsSection.isActive('0')}}" stepKey="seeBlockNotEnable" />
43+
<actionGroup ref="AssertCMSPageContentActionGroup" stepKey="assertContent"/>
44+
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitBtn3" />
45+
<click selector="{{CmsNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveAndClose"/>
46+
<see userInput="You saved the page." stepKey="seeSavedCMSPageMsgOnGrid"/>
47+
<seeElement selector="div[data-role='grid-wrapper']" stepKey="seeGridPage" />
48+
</test>
49+
</tests>

0 commit comments

Comments
 (0)