Skip to content

Commit 3eb12f3

Browse files
soumyausoumyau
committed
Merge remote-tracking branch 'origin/PR-761' into migration-pr
2 parents 179063e + 4b6afbe commit 3eb12f3

11 files changed

+226
-0
lines changed

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingCreateNewsletterTemplateActionGroup.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
<!--Create New Template -->
12+
<actionGroup name="AdminMarketingCreateNewsletterTemplateActionGroup">
13+
<arguments>
14+
<argument name="name" type="string"/>
15+
<argument name="subject" type="string"/>
16+
<argument name="senderName" type="string"/>
17+
<argument name="senderEmail" type="string"/>
18+
<argument name="templateContent" type="string"/>
19+
</arguments>
20+
<!--Filling All Required Fields-->
21+
<fillField stepKey="fillTemplateNameField" selector="{{BasicFieldNewsletterSection.templateName}}" userInput="{{name}}"/>
22+
<fillField stepKey="fillTemplateSubjectField" selector="{{BasicFieldNewsletterSection.templateSubject}}" userInput="{{subject}}"/>
23+
<fillField stepKey="fillSenderNameField" selector="{{BasicFieldNewsletterSection.senderName}}" userInput="{{senderName}}"/>
24+
<fillField stepKey="fillSenderEmailField" selector="{{BasicFieldNewsletterSection.senderEmail}}" userInput="{{senderEmail}}"/>
25+
<fillField stepKey="fillTemplateContentField" selector="{{NewsletterWYSIWYGSection.TextArea}}" userInput="{{templateContent}}"/>
26+
<!--Saving Created Template-->
27+
<click stepKey="clickSaveTemplateButton" selector="{{AdminNewsletterMainActionsSection.saveTemplateButton}}"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingDeleteNewsletterTemplateActionGroup.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+
<!--Delete Newsletter Template -->
12+
<actionGroup name="AdminMarketingDeleteNewsletterTemplateActionGroup">
13+
<click stepKey="clickDeleteButton" selector="{{AdminNewsletterMainActionsSection.deleteTemplateButton}}"/>
14+
<click stepKey="confirmDelete" selector="{{AdminNewsletterMainActionsSection.confirmDelete}}"/>
15+
<waitForPageLoad stepKey="waitForPageLoading"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingOpenNewsletterTemplateFromGridActionGroup.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
12+
<!--Open Newsletter Template -->
13+
<actionGroup name="AdminMarketingOpenNewsletterTemplateFromGridActionGroup">
14+
<click stepKey="openTemplate" selector="{{AdminNewsletterGridMainActionsSection.searchResultFirstRow}}"/>
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminNavigateToCreateNewsletterTemplatePageActionGroup.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+
12+
<!--Click "Add New Template" button-->
13+
<actionGroup name="AdminNavigateToCreateNewsletterTemplatePageActionGroup">
14+
<click stepKey="clickAddNewTemplateButton" selector="{{AdminNewsletterGridMainActionsSection.add}}"/>
15+
<waitForPageLoad stepKey="waitForNewNewsletterTemplatesPageLoaded"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminSearchNewsletterTemplateOnGridActionGroup.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+
12+
<!--Search Newsletter Template On Grid -->
13+
<actionGroup name="AdminSearchNewsletterTemplateOnGridActionGroup">
14+
<arguments>
15+
<argument name="name" type="string"/>
16+
<argument name="subject" type="string"/>
17+
</arguments>
18+
<fillField userInput="{{name}}" selector="{{AdminNewsletterGridMainActionsSection.name}}" stepKey="filterName"/>
19+
<fillField userInput="{{subject}}" selector="{{AdminNewsletterGridMainActionsSection.subject}}" stepKey="filterSubject"/>
20+
<click stepKey="clickSearchButton" selector="{{AdminNewsletterGridMainActionsSection.search}}"/>
21+
<waitForPageLoad stepKey="waitForNewNewsletterTemplatesPageLoadedAfterFiltering"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AssertAdminCreatedNewsletterTemplateInGridActionGroup.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+
12+
<!--Search Newsletter Template On Grid -->
13+
<actionGroup name="AssertAdminCreatedNewsletterTemplateInGridActionGroup">
14+
<arguments>
15+
<argument name="name" type="string"/>
16+
<argument name="subject" type="string"/>
17+
</arguments>
18+
19+
<see userInput="{{name}}" selector="{{AdminNewsletterGridMainActionsSection.newsletterGrid}}" stepKey="assertTemplatename"/>
20+
<see userInput="{{subject}}" selector="{{AdminNewsletterGridMainActionsSection.newsletterGrid}}" stepKey="assertTemplateSubject"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<data key="subject">Test Newsletter Subject</data>
1414
<data key="senderName">Admin</data>
1515
<data key="senderEmail">admin@magento.com</data>
16+
<data key="textAreaContent">Some Test Content</data>
1617
</entity>
1718
</entities>

‎app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterGridMainActionsSection.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminNewsletterGridMainActionsSection">
11+
<element name="newsletterGrid" type="text" selector="table.data-grid"/>
12+
<element name="add" type="button" selector=".page-actions .page-actions-buttons .add"/>
13+
<element name="name" type="input" selector="[id$='filter_code']"/>
14+
<element name="subject" type="input" selector="[id$='filter_subject']"/>
15+
<element name="search" type="button" selector=".action-default.scalable.action-secondary"/>
16+
<element name="resetFilter" type="button" selector=".action-default.scalable.action-reset.action-tertiary"/>
17+
<element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
18+
<element name="messageByType" type="block" selector="#messages .message-{{messageType}}" parameterized="true"/>
19+
</section>
20+
</sections>

‎app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterMainActionsSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminNewsletterMainActionsSection">
11+
<element name="saveTemplateButton" type="button" selector=".page-actions-inner .page-actions-buttons .save"/>
12+
<element name="deleteTemplateButton" type="button" selector=".page-actions-inner .page-actions-buttons .delete"/>
13+
<element name="confirmDelete" type="button" selector=".action-primary.action-accept" timeout="10"/>
14+
</section>
15+
</sections>

‎app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingCreateNewsletterTemplateTest.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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="AdminMarketingCreateNewsletterTemplateTest">
12+
<annotations>
13+
<features value="Newsletter"/>
14+
<stories value="Admin Creates Newsletter Template"/>
15+
<title value="Newsletter Template Creation"/>
16+
<description value="Newsletter Template Successfully Created"/>
17+
<group value="newsletter"/>
18+
<group value="mtf_migrated"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
22+
</before>
23+
<after>
24+
<!-- Delete Created Newsletter Template -->
25+
<actionGroup ref="AdminSearchNewsletterTemplateOnGridActionGroup" stepKey="findCreatedNewsletterTemplateInGrid">
26+
<argument name="name" value="{{_defaultNewsletter.name}}"/>
27+
<argument name="subject" value="{{_defaultNewsletter.subject}}"/>
28+
</actionGroup>
29+
<actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
30+
<actionGroup ref="AdminMarketingDeleteNewsletterTemplateActionGroup" stepKey="deleteTemplate"/>
31+
<actionGroup ref="logout" stepKey="logout"/>
32+
</after>
33+
<!--TEST BODY -->
34+
<!-- Navigate To MARKETING > Newsletter Template -->
35+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterTemplatePage">
36+
<argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
37+
<argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.dataUiId}}"/>
38+
</actionGroup>
39+
<!-- Navigate To Create Newsletter Template Page -->
40+
<actionGroup ref="AdminNavigateToCreateNewsletterTemplatePageActionGroup" stepKey="navigateToCreateNewsletterPage"/>
41+
<!-- Create Newsletter Template -->
42+
<actionGroup ref="AdminMarketingCreateNewsletterTemplateActionGroup" stepKey="updateNewsletterTemplate">
43+
<argument name="name" value="{{_defaultNewsletter.name}}"/>
44+
<argument name="subject" value="{{_defaultNewsletter.subject}}"/>
45+
<argument name="senderName" value="{{_defaultNewsletter.senderName}}"/>
46+
<argument name="senderEmail" value="{{_defaultNewsletter.senderEmail}}"/>
47+
<argument name="templateContent" value="{{_defaultNewsletter.textAreaContent}}"/>
48+
</actionGroup>
49+
<!-- Assert Success Message -->
50+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeSuccessMessage">
51+
<argument name="message" value="The newsletter template has been saved."/>
52+
</actionGroup>
53+
<!-- Find Created Newsletter On grid -->
54+
<actionGroup ref="AdminSearchNewsletterTemplateOnGridActionGroup" stepKey="findCreatedNewsletterTemplate">
55+
<argument name="name" value="{{_defaultNewsletter.name}}"/>
56+
<argument name="subject" value="{{_defaultNewsletter.subject}}"/>
57+
</actionGroup>
58+
<!-- Assert Created Newsletter on Grid -->
59+
<actionGroup ref="AssertAdminCreatedNewsletterTemplateInGridActionGroup" stepKey="assertNewsletterInGrid">
60+
<argument name="name" value="{{_defaultNewsletter.name}}"/>
61+
<argument name="subject" value="{{_defaultNewsletter.subject}}"/>
62+
</actionGroup>
63+
<!--END TEST BODY -->
64+
</test>
65+
</tests>

0 commit comments

Comments
 (0)