Skip to content

Commit 179063e

Browse files
soumyausoumyau
committed
Merge remote-tracking branch 'origin/PR-764' into migration-pr
2 parents b24e329 + 2ef17de commit 179063e

File tree

5 files changed

+91
-1
lines changed

5 files changed

+91
-1
lines changed

‎app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AdminMarketingSitemapSearchActionGroup.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="AdminMarketingSitemapSearchActionGroup">
12+
<arguments>
13+
<argument name="filename" type="string"/>
14+
</arguments>
15+
<click selector="{{AdminMarketingSiteMapGridSection.resetButton}}" stepKey="resetSearchFilter"/>
16+
<fillField selector="{{AdminMarketingSiteMapGridSection.fileNameTextField}}" userInput="{{filename}}" stepKey="fillFileNameField"/>
17+
<click selector="{{AdminMarketingSiteMapGridSection.searchButton}}" stepKey="clickSearchButton"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Sitemap/Test/Mftf/ActionGroup/AssertAdminSitemapIsNotInGridActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertAdminSitemapIsNotInGridActionGroup">
12+
<arguments>
13+
<argument name="filename" type="string"/>
14+
</arguments>
15+
<dontSee userInput="{{filename}}" selector="{{AdminMarketingSiteMapGridSection.firstSearchResult}}" stepKey="verifyThatCorrectStoreGroupFound"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Sitemap/Test/Mftf/Data/SitemapData.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
<data key="filename">sitemap.xml</data>
1313
<data key="path">/</data>
1414
</entity>
15+
<entity name="UniqueSitemapName">
16+
<data key="filename" unique="prefix">sitemap.xml</data>
17+
<data key="path">/</data>
18+
</entity>
1519
</entities>

‎app/code/Magento/Sitemap/Test/Mftf/Test/AdminMarketingDeleteSitemapEntityTest.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
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="AdminMarketingDeleteSitemapEntityTest">
12+
<annotations>
13+
<features value="Sitemap"/>
14+
<stories value="Admin Deletes Sitemap Entity Test"/>
15+
<title value="Sitemap Deleting Test"/>
16+
<description value="Admin Should Delete Sitemap Entity"/>
17+
<testCaseId value="MC-14315"/>
18+
<group value="sitemap"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<!--Navigate to Marketing->Sitemap Page -->
24+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToMarketingSiteMapPage">
25+
<argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
26+
<argument name="submenuUiId" value="{{AdminMenuSEOAndSearchSiteMap.dataUiId}}"/>
27+
</actionGroup>
28+
<!-- Navigate To New Sitemap Page -->
29+
<actionGroup ref="AdminMarketingSiteMapNavigateNewActionGroup" stepKey="navigateToNewSitemapPage"/>
30+
<!-- Create Sitemap Entity -->
31+
<actionGroup ref="AdminMarketingSiteMapFillFormActionGroup" stepKey="createSitemap">
32+
<argument name="sitemap" value="UniqueSitemapName"/>
33+
</actionGroup>
34+
</before>
35+
<after>
36+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
37+
</after>
38+
39+
<actionGroup ref="AdminMarketingSiteDeleteByNameActionGroup" stepKey="deleteCreatedSitemap">
40+
<argument name="filename" value="{{UniqueSitemapName.filename}}"/>
41+
</actionGroup>
42+
<actionGroup ref="AssertSiteMapDeleteSuccessActionGroup" stepKey="assertSuccessMessage"/>
43+
<actionGroup ref="AdminMarketingSitemapSearchActionGroup" stepKey="searchDeletedSitemap">
44+
<argument name="filename" value="{{UniqueSitemapName.filename}}"/>
45+
</actionGroup>
46+
<actionGroup ref="AssertAdminSitemapIsNotInGridActionGroup" stepKey="dontSeeEntity">
47+
<argument name="filename" value="{{UniqueSitemapName.filename}}"/>
48+
</actionGroup>
49+
</test>
50+
</tests>

‎dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/DeleteSitemapEntityTest.xml

Lines changed: 1 addition & 1 deletion
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\Sitemap\Test\TestCase\DeleteSitemapEntityTest" summary="Delete Sitemap Entity" ticketId="MAGETWO-23296">
1010
<variation name="DeleteSitemapEntityTestVariation1">
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="sitemap/dataset" xsi:type="string">default</data>
1313
<constraint name="Magento\Sitemap\Test\Constraint\AssertSitemapSuccessDeleteMessage" />
1414
<constraint name="Magento\Sitemap\Test\Constraint\AssertSitemapNotInGrid" />

0 commit comments

Comments
 (0)