Skip to content

Commit 64c5f2e

Browse files
KevinBKozanKevinBKozan
committed
Merge branch 'pr750' into MTF-MFTF-migration-kozan
2 parents 8f73566 + 21189a1 commit 64c5f2e

File tree

4 files changed

+262
-3
lines changed

4 files changed

+262
-3
lines changed

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

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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="AdminUpdateCmsPageRewriteEntityWithNoRedirectTest">
11+
<annotations>
12+
<stories value="Update CMS Page URL Redirect With No Redirect"/>
13+
<title value="Update CMS Page URL Redirect With No 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="updateUrlRewriteFirstAttempt">
58+
<argument name="storeValue" value="{{customStore.name}}"/>
59+
<argument name="requestPath" value="newrequestpath"/>
60+
<argument name="redirectTypeValue" value="No"/>
61+
<argument name="description" value="test_description_custom_store"/>
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="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
71+
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="storefrontSwitchToCustomStoreView">
72+
<argument name="storeView" value="customStore"/>
73+
</actionGroup>
74+
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToTheStoreFront">
75+
<argument name="page" value="newrequestpath"/>
76+
</actionGroup>
77+
<actionGroup ref="AssertStoreFrontCMSPage" stepKey="assertCMSPage">
78+
<argument name="cmsTitle" value="$$createCMSPage.title$$"/>
79+
<argument name="cmsContent" value="$$createCMSPage.content$$"/>
80+
<argument name="cmsContentHeading" value="$$createCMSPage.content_heading$$"/>
81+
</actionGroup>
82+
83+
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
84+
<argument name="requestPath" value="newrequestpath"/>
85+
</actionGroup>
86+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView"/>
87+
88+
</test>
89+
</tests>

‎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>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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\UpdateCmsPageRewriteEntityTest" summary="Update Cms Page URL Rewrites " ticketId="MAGETWO-26173">
1010
<variation name="UpdateCmsPageRewriteEntityTestVariation1">
11-
<data name="tag" xsi:type="string">severity:S2</data>
11+
<data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
1212
<data name="cmsPageRewrite/dataset" xsi:type="string">cms_default_no_redirect</data>
1313
<data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/%default%</data>
1414
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
@@ -18,7 +18,7 @@
1818
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
1919
</variation>
2020
<variation name="UpdateCmsPageRewriteEntityTestVariation2">
21-
<data name="tag" xsi:type="string">severity:S2</data>
21+
<data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
2222
<data name="cmsPageRewrite/dataset" xsi:type="string">cms_default_temporary_redirect</data>
2323
<data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
2424
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.html</data>
@@ -28,7 +28,7 @@
2828
<constraint name="Magento\Cms\Test\Constraint\AssertUrlRewriteCmsPageRedirect" />
2929
</variation>
3030
<variation name="UpdateCmsPageRewriteEntityTestVariation3">
31-
<data name="tag" xsi:type="string">severity:S2</data>
31+
<data name="tag" xsi:type="string">severity:S2,mftf_migrated:yes</data>
3232
<data name="cmsPageRewrite/dataset" xsi:type="string">cms_default_permanent_redirect</data>
3333
<data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
3434
<data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%.htm</data>

0 commit comments

Comments
 (0)