Skip to content

Commit 21189a1

Browse files
kate-kyzymakate-kyzyma
committed
Separating the test into 3 individual tests.
1 parent 921ff54 commit 21189a1

File tree

3 files changed

+175
-63
lines changed

3 files changed

+175
-63
lines changed

‎app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityTest.xml renamed to ‎app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithNoRedirectTest.xml

Lines changed: 5 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminUpdateCmsPageRewriteEntityTest">
10+
<test name="AdminUpdateCmsPageRewriteEntityWithNoRedirectTest">
1111
<annotations>
12-
<stories value="Update CMS Page URL Redirect"/>
13-
<title value="Update CMS Page URL Redirect"/>
12+
<stories value="Update CMS Page URL Redirect With No Redirect"/>
13+
<title value="Update CMS Page URL Redirect With No Redirect"/>
1414
<description value="Login as Admin and tried to update the created URL Rewrite for CMS page"/>
1515
<group value="cMSContent"/>
1616
<group value="mtf_migrated"/>
@@ -53,7 +53,7 @@
5353
<argument name="requestPath" value="created-new-cms-page"/>
5454
</actionGroup>
5555

56-
<!-- Update URL Rewrite for CMS Page First Attempt -->
56+
<!-- Update URL Rewrite for CMS Page -->
5757
<actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewriteFirstAttempt">
5858
<argument name="storeValue" value="{{customStore.name}}"/>
5959
<argument name="requestPath" value="newrequestpath"/>
@@ -80,66 +80,8 @@
8080
<argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
8181
</actionGroup>
8282

83-
<!--Search created CMS page url rewrite in grid second attempt-->
84-
<actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewriteSecondAttempt">
85-
<argument name="requestPath" value="newrequestpath"/>
86-
</actionGroup>
87-
88-
<!-- Update URL Rewrite for CMS Page Second Attempt -->
89-
<actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewriteSecondAttempt">
90-
<argument name="storeValue" value="Default Store View"/>
91-
<argument name="requestPath" value="temporaryrequestpath.html"/>
92-
<argument name="redirectTypeValue" value="Temporary (302)"/>
93-
<argument name="description" value="test description_302"/>
94-
</actionGroup>
95-
96-
<!-- Assert Url Rewrite Save Message -->
97-
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessageSecondAttempt">
98-
<argument name="message" value="The URL Rewrite has been saved."/>
99-
</actionGroup>
100-
101-
<!-- Assert Url Rewrite Cms Page Redirect -->
102-
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepageSecondAttempt"/>
103-
<actionGroup ref="StorefrontSwitchDefaultStoreViewActionGroup" stepKey="switchToDefaultStoreView"/>
104-
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFrontSecondAttempt">
105-
<argument name="page" value="temporaryrequestpath.html"/>
106-
</actionGroup>
107-
<actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPageSecondAttempt">
108-
<argument name="cmsTitle" value="$$createCMSPage.title$$"/>
109-
<argument name="cmsContent" value="$$createCMSPage.content$$"/>
110-
<argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
111-
</actionGroup>
112-
113-
<!--Search created CMS page url rewrite in grid third attempt-->
114-
<actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewriteThirdAttempt">
115-
<argument name="requestPath" value="temporaryrequestpath.html"/>
116-
</actionGroup>
117-
118-
<!-- Update URL Rewrite for CMS Page Third Attempt -->
119-
<actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewriteThirdAttempt">
120-
<argument name="storeValue" value="Default Store View"/>
121-
<argument name="requestPath" value="permanentrequestpath.htm"/>
122-
<argument name="redirectTypeValue" value="Permanent (301)"/>
123-
<argument name="description" value="test_description_301"/>
124-
</actionGroup>
125-
126-
<!-- Assert Url Rewrite Save Message -->
127-
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessageThirdAttempt">
128-
<argument name="message" value="The URL Rewrite has been saved."/>
129-
</actionGroup>
130-
131-
<!-- Assert Url Rewrite Cms Page Redirect -->
132-
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFrontThirdAttempt">
133-
<argument name="page" value="permanentrequestpath.htm"/>
134-
</actionGroup>
135-
<actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPageThirdAttempt">
136-
<argument name="cmsTitle" value="$$createCMSPage.title$$"/>
137-
<argument name="cmsContent" value="$$createCMSPage.content$$"/>
138-
<argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
139-
</actionGroup>
140-
14183
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
142-
<argument name="requestPath" value="permanentrequestpath.htm"/>
84+
<argument name="requestPath" value="newrequestpath"/>
14385
</actionGroup>
14486
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
14587

‎app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithPermanentReirectTest.xml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminUpdateCmsPageRewriteEntityWithPermanentRedirectTest">
11+
<annotations>
12+
<stories value="Update CMS Page URL Redirect With Permanent Redirect"/>
13+
<title value="Update CMS Page URL Redirect With Permanent Redirect"/>
14+
<description value="Login as Admin and tried to update the created URL Rewrite for CMS page"/>
15+
<group value="cMSContent"/>
16+
<group value="mtf_migrated"/>
17+
</annotations>
18+
19+
<before>
20+
<createData entity="simpleCmsPage" stepKey="createCMSPage"/>
21+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
22+
</before>
23+
<after>
24+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
25+
<actionGroup ref="logout" stepKey="logout"/>
26+
</after>
27+
28+
<!--Create Custom Store View-->
29+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
30+
31+
<!-- Open CMS Edit Page, Get the CMS ID and Modify Store View Option to All Store Views -->
32+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
33+
<argument name="CMSPage" value="$$createCMSPage$$"/>
34+
</actionGroup>
35+
<grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
36+
<actionGroup ref="AddStoreViewToCmsPage" stepKey="updateStoreViewForCmsPage">
37+
<argument name="CMSPage" value="$$createCMSPage$$"/>
38+
<argument name="storeViewName" value="All Store Views"/>
39+
</actionGroup>
40+
41+
<!--Create CMS Page URL Redirect-->
42+
<actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
43+
<argument name="customUrlRewriteValue" value="Custom"/>
44+
<argument name="storeValue" value="Default Store View"/>
45+
<argument name="requestPath" value="created-new-cms-page"/>
46+
<argument name="redirectTypeValue" value="No"/>
47+
<argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
48+
<argument name="description" value="Created New CMS Page"/>
49+
</actionGroup>
50+
51+
<!--Search created CMS page url rewrite in grid-->
52+
<actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
53+
<argument name="requestPath" value="created-new-cms-page"/>
54+
</actionGroup>
55+
56+
<!-- Update URL Rewrite for CMS Page -->
57+
<actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewrite">
58+
<argument name="storeValue" value="Default Store View"/>
59+
<argument name="requestPath" value="permanentrequestpath.htm"/>
60+
<argument name="redirectTypeValue" value="Permanent (301)"/>
61+
<argument name="description" value="test_description_301"/>
62+
</actionGroup>
63+
64+
<!-- Assert Url Rewrite Save Message -->
65+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
66+
<argument name="message" value="The URL Rewrite has been saved."/>
67+
</actionGroup>
68+
69+
<!-- Assert Url Rewrite Cms Page Redirect -->
70+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
71+
<argument name="page" value="permanentrequestpath.htm"/>
72+
</actionGroup>
73+
<actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
74+
<argument name="cmsTitle" value="$$createCMSPage.title$$"/>
75+
<argument name="cmsContent" value="$$createCMSPage.content$$"/>
76+
<argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
77+
</actionGroup>
78+
79+
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
80+
<argument name="requestPath" value="permanentrequestpath.htm"/>
81+
</actionGroup>
82+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
83+
84+
</test>
85+
</tests>

‎app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUpdateCmsPageRewriteEntityWithTemporaryRedirectTest.xml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminUpdateCmsPageRewriteEntityWithTemporaryRedirectTest">
11+
<annotations>
12+
<stories value="Update CMS Page URL Redirect With Temporary Redirect"/>
13+
<title value="Update CMS Page URL Redirect With Temporary Redirect"/>
14+
<description value="Login as Admin and tried to update the created URL Rewrite for CMS page"/>
15+
<group value="cMSContent"/>
16+
<group value="mtf_migrated"/>
17+
</annotations>
18+
19+
<before>
20+
<createData entity="simpleCmsPage" stepKey="createCMSPage"/>
21+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
22+
</before>
23+
<after>
24+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
25+
<actionGroup ref="logout" stepKey="logout"/>
26+
</after>
27+
28+
<!--Create Custom Store View-->
29+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
30+
31+
<!-- Open CMS Edit Page, Get the CMS ID and Modify Store View Option to All Store Views -->
32+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
33+
<argument name="CMSPage" value="$$createCMSPage$$"/>
34+
</actionGroup>
35+
<grabFromCurrentUrl stepKey="cmsId" regex="#\/([0-9]*)?\/$#"/>
36+
<actionGroup ref="AddStoreViewToCmsPage" stepKey="updateStoreViewForCmsPage">
37+
<argument name="CMSPage" value="$$createCMSPage$$"/>
38+
<argument name="storeViewName" value="All Store Views"/>
39+
</actionGroup>
40+
41+
<!--Create CMS Page URL Redirect-->
42+
<actionGroup ref="AdminAddCustomUrlRewrite" stepKey="addCustomUrlRewrite">
43+
<argument name="customUrlRewriteValue" value="Custom"/>
44+
<argument name="storeValue" value="Default Store View"/>
45+
<argument name="requestPath" value="created-new-cms-page"/>
46+
<argument name="redirectTypeValue" value="Permanent (301)"/>
47+
<argument name="targetPath" value="cms/page/view/page_id/{$cmsId}"/>
48+
<argument name="description" value="Created New CMS Page"/>
49+
</actionGroup>
50+
51+
<!--Search created CMS page url rewrite in grid-->
52+
<actionGroup ref="AdminSearchAndSelectUrlRewriteInGrid" stepKey="searchUrlRewrite">
53+
<argument name="requestPath" value="created-new-cms-page"/>
54+
</actionGroup>
55+
56+
<!-- Update URL Rewrite for CMS Page -->
57+
<actionGroup ref="AdminUpdateUrlRewrite" stepKey="updateUrlRewrite">
58+
<argument name="storeValue" value="Default Store View"/>
59+
<argument name="requestPath" value="temporaryrequestpath.html"/>
60+
<argument name="redirectTypeValue" value="Temporary (302)"/>
61+
<argument name="description" value="test description_302"/>
62+
</actionGroup>
63+
64+
<!-- Assert Url Rewrite Save Message -->
65+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
66+
<argument name="message" value="The URL Rewrite has been saved."/>
67+
</actionGroup>
68+
69+
<!-- Assert Url Rewrite Cms Page Redirect -->
70+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
71+
<argument name="page" value="temporaryrequestpath.html"/>
72+
</actionGroup>
73+
<actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
74+
<argument name="cmsTitle" value="$$createCMSPage.title$$"/>
75+
<argument name="cmsContent" value="$$createCMSPage.content$$"/>
76+
<argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
77+
</actionGroup>
78+
79+
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
80+
<argument name="requestPath" value="temporaryrequestpath.html"/>
81+
</actionGroup>
82+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
83+
84+
</test>
85+
</tests>

0 commit comments

Comments
 (0)