Skip to content

Commit e287963

Browse files
kate-kyzymakate-kyzyma
committed
Code refactoring
1 parent 7e83077 commit e287963

8 files changed

+235
-111
lines changed

‎app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminCreateNewUrlRewriteForCmsPageActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateNewUrlRewriteForCmsPageActionGroup">
12+
<annotations>
13+
<description>Select "For Csm Page" URL Rewrite type</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="customUrlRewriteValue" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="clickOnCustomUrlRewrite"/>
20+
<click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewriteValue('customUrlRewriteValue')}}" stepKey="selectForCsmPage"/>
21+
<waitForPageLoad stepKey="waitForCategoryEditSectionToLoad"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminAddUrlRewriteForCmsPageActionGroup.xml renamed to ‎app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminFillNewCmsPageUrlRewriteFormActionGroup.xml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,23 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminAddUrlRewriteForCmsPageActionGroup">
11+
<actionGroup name="AdminFillNewCmsPageUrlRewriteFormActionGroup">
1212
<annotations>
13-
<description>Goes to the Admin Add URL Rewrite edit page. Fills in the provided URL details. Clicks on Save. Validates that the Success Message is present.</description>
13+
<description>Fills in the provided URL details. Clicks on Save.</description>
1414
</annotations>
1515
<arguments>
16-
<argument name="cmsPageUrlKey" type="string"/>
17-
<argument name="customUrlRewriteValue" type="string"/>
1816
<argument name="storeValue" type="string"/>
1917
<argument name="requestPath" type="string"/>
2018
<argument name="redirectTypeValue" type="string"/>
2119
<argument name="description" type="string"/>
2220
</arguments>
2321

24-
<amOnPage url="{{AdminUrlRewriteEditPage.url}}" stepKey="openUrlRewriteEditPage"/>
25-
<waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
26-
<click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewrite}}" stepKey="clickOnCustomUrlRewrite"/>
27-
<click selector="{{AdminUrlRewriteEditSection.createCustomUrlRewriteValue('customUrlRewriteValue')}}" stepKey="selectForCsmPage"/>
28-
<waitForPageLoad stepKey="waitForCategoryEditSectionToLoad"/>
29-
<click selector="{{AdminUrlRewriteEditSection.cmsPage('cmsPageUrlKey')}}" stepKey="selectCmsPage"/>
30-
<waitForPageLoad stepKey="waitForPageToLoad"/>
3122
<click selector="{{AdminUrlRewriteEditSection.store}}" stepKey="clickOnStore"/>
3223
<click selector="{{AdminUrlRewriteEditSection.storeValue('storeValue')}}" stepKey="clickOnStoreValue"/>
3324
<fillField selector="{{AdminUrlRewriteEditSection.requestPath}}" userInput="{{requestPath}}" stepKey="fillRequestPath"/>
3425
<click selector="{{AdminUrlRewriteEditSection.redirectType}}" stepKey="selectRedirectType"/>
3526
<click selector="{{AdminUrlRewriteEditSection.redirectTypeValue('redirectTypeValue')}}" stepKey="clickOnRedirectTypeValue"/>
3627
<fillField selector="{{AdminUrlRewriteEditSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
3728
<click selector="{{AdminUrlRewriteEditSection.saveButton}}" stepKey="clickOnSaveButton"/>
38-
<seeElement selector="{{AdminUrlRewriteIndexSection.successMessage}}" stepKey="seeSuccessSaveMessage"/>
3929
</actionGroup>
4030
</actionGroups>

‎app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminGoToAddNewUrlRewritePageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminGoToAddNewUrlRewritePageActionGroup">
12+
<annotations>
13+
<description>Goes to the Admin Add URL Rewrite edit page</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminUrlRewriteEditPage.url}}" stepKey="openUrlRewriteEditPage"/>
17+
<waitForPageLoad stepKey="waitForUrlRewriteEditPageToLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/UrlRewrite/Test/Mftf/ActionGroup/AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup">
12+
<annotations>
13+
<description>Select Cms Page for URL Rewrite from the grid</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="cmsPageUrlKey" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminUrlRewriteEditSection.cmsPage('cmsPageUrlKey')}}" stepKey="selectCmsPage"/>
20+
<waitForPageLoad stepKey="waitForPageToLoad"/>
21+
</actionGroup>
22+
</actionGroups>

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

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

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminDeleteCmsPageUrlRewriteWithNoRedirectsTest">
11+
<annotations>
12+
<stories value="Delete CMS Page URL rewrite with No Redirects"/>
13+
<title value="Delete CMS Page URL rewrite with No Redirects"/>
14+
<description value="Log in to admin and delete CMS Page URL rewrite with No Redirects"/>
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="loginToAdminPanel"/>
22+
</before>
23+
<after>
24+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
25+
<actionGroup ref="logout" stepKey="logout"/>
26+
</after>
27+
28+
<actionGroup ref="AdminGoToAddNewUrlRewritePageActionGroup" stepKey="openUrlRewriteEditPage"/>
29+
<actionGroup ref="AdminCreateNewUrlRewriteForCmsPageActionGroup" stepKey="selectForCsmPageType">
30+
<argument name="customUrlRewriteValue" value="For CMS page'"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup" stepKey="selectCmsPge">
33+
<argument name="cmsPageUrlKey" value="$$createCMSPage.identifier$$"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminFillNewCmsPageUrlRewriteFormActionGroup" stepKey="fillTheForm">
36+
<argument name="storeValue" value="Default Store View"/>
37+
<argument name="requestPath" value="newrequestpath"/>
38+
<argument name="redirectTypeValue" value="No"/>
39+
<argument name="description" value="cms_default_no_redirect"/>
40+
</actionGroup>
41+
42+
<!--Delete the URL Rewrite for CMS Page with No redirects-->
43+
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteCustomUrlRewrite">
44+
<argument name="requestPath" value="newrequestpath"/>
45+
</actionGroup>
46+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
47+
<argument name="message" value="You deleted the URL rewrite."/>
48+
</actionGroup>
49+
<!--Search and verify AssertUrlRewriteNotInGrid-->
50+
<actionGroup ref="AdminSearchDeletedUrlRewrite" stepKey="searchDeletedUrlRewriteInGrid">
51+
<argument name="requestPath" value="newrequestpath"/>
52+
</actionGroup>
53+
<!--Verify AssertPageByUrlRewriteIsNotFound-->
54+
<actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="assertPageByUrlRewriteIsNotFound">
55+
<argument name="requestPath" value="newrequestpath"/>
56+
</actionGroup>
57+
58+
</test>
59+
</tests>

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminDeleteCmsPageUrlRewriteWithPermanentRedirectTest">
11+
<annotations>
12+
<stories value="Delete CMS Page URL rewrite with Permanent Redirect"/>
13+
<title value="Delete CMS Page URL rewrite with Permanent Redirect"/>
14+
<description value="Log in to admin and delete CMS Page URL rewrite with Permanent Redirect"/>
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="loginToAdminPanel"/>
22+
</before>
23+
<after>
24+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
25+
<actionGroup ref="logout" stepKey="logout"/>
26+
</after>
27+
28+
<actionGroup ref="AdminGoToAddNewUrlRewritePageActionGroup" stepKey="openUrlRewriteEditPage"/>
29+
<actionGroup ref="AdminCreateNewUrlRewriteForCmsPageActionGroup" stepKey="selectForCsmPageType">
30+
<argument name="customUrlRewriteValue" value="For CMS page'"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup" stepKey="selectCmsPge">
33+
<argument name="cmsPageUrlKey" value="$$createCMSPage.identifier$$"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminFillNewCmsPageUrlRewriteFormActionGroup" stepKey="fillTheForm">
36+
<argument name="storeValue" value="Default Store View"/>
37+
<argument name="requestPath" value="permanentrequestpath.html"/>
38+
<argument name="redirectTypeValue" value="Permanent (301)"/>
39+
<argument name="description" value="cms_default_permanent_redirect"/>
40+
</actionGroup>
41+
42+
<!-- Delete the URL Rewrite for CMS Page with permanent redirect-->
43+
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deletePermanentUrlRewrite">
44+
<argument name="requestPath" value="permanentrequestpath.html"/>
45+
</actionGroup>
46+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
47+
<argument name="message" value="You deleted the URL rewrite."/>
48+
</actionGroup>
49+
<!-- Verify AssertPageByUrlRewriteIsNotFound -->
50+
<actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="assertPageByUrlRewriteIsNotFound">
51+
<argument name="requestPath" value="permanentrequestpath.html"/>
52+
</actionGroup>
53+
54+
</test>
55+
</tests>

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminDeleteCmsPageUrlRewriteWithTemporaryRedirectTest">
11+
<annotations>
12+
<stories value="Delete CMS Page URL rewrite with Temporary Redirect"/>
13+
<title value="Delete CMS Page URL rewrite with Temporary Redirect"/>
14+
<description value="Log in to admin and delete CMS Page URL rewrite with Temporary Redirect"/>
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="loginToAdminPanel"/>
22+
</before>
23+
<after>
24+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
25+
<actionGroup ref="logout" stepKey="logout"/>
26+
</after>
27+
28+
<actionGroup ref="AdminGoToAddNewUrlRewritePageActionGroup" stepKey="openUrlRewriteEditPage"/>
29+
<actionGroup ref="AdminCreateNewUrlRewriteForCmsPageActionGroup" stepKey="selectForCsmPageType">
30+
<argument name="customUrlRewriteValue" value="For CMS page'"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminSelectCmsPageFromGridForNewUrlRewriteActionGroup" stepKey="selectCmsPge">
33+
<argument name="cmsPageUrlKey" value="$$createCMSPage.identifier$$"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminFillNewCmsPageUrlRewriteFormActionGroup" stepKey="fillTheForm">
36+
<argument name="storeValue" value="Default Store View"/>
37+
<argument name="requestPath" value="temporaryrequestpath.html"/>
38+
<argument name="redirectTypeValue" value="Temporary (302)"/>
39+
<argument name="description" value="cms_default_temporary_redirect"/>
40+
</actionGroup>
41+
42+
<!-- Delete the URL Rewrite for CMS Page with with temporary redirect-->
43+
<actionGroup ref="AdminDeleteUrlRewrite" stepKey="deleteTemporaryUrlRewrite">
44+
<argument name="requestPath" value="temporaryrequestpath.html"/>
45+
</actionGroup>
46+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
47+
<argument name="message" value="You deleted the URL rewrite."/>
48+
</actionGroup>
49+
<!--Verify AssertPageByUrlRewriteIsNotFound-->
50+
<actionGroup ref="AssertPageByUrlRewriteIsNotFound" stepKey="assertPageByUrlRewriteIsNotFound">
51+
<argument name="requestPath" value="temporaryrequestpath.html"/>
52+
</actionGroup>
53+
54+
</test>
55+
</tests>

0 commit comments

Comments
 (0)