Skip to content

Commit b62f82f

Browse files
soumyausoumyau
committed
Merge remote-tracking branch 'origin/PR-762' into migration-pr
# Conflicts: # app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingOpenNewsletterTemplateFromGridActionGroup.xml # app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminNavigateToCreateNewsletterTemplatePageActionGroup.xml # app/code/Magento/Newsletter/Test/Mftf/Data/NewsletterTemplateData.xml
2 parents b746702 + ca83f19 commit b62f82f

File tree

6 files changed

+121
-4
lines changed

6 files changed

+121
-4
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
12-
<!--Open Newsletter Template -->
1311
<actionGroup name="AdminMarketingOpenNewsletterTemplateFromGridActionGroup">
1412
<click stepKey="openTemplate" selector="{{AdminNewsletterGridMainActionsSection.searchResultFirstRow}}"/>
1513
</actionGroup>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
12-
<!--Click "Add New Template" button-->
1311
<actionGroup name="AdminNavigateToCreateNewsletterTemplatePageActionGroup">
1412
<click stepKey="clickAddNewTemplateButton" selector="{{AdminNewsletterGridMainActionsSection.add}}"/>
1513
<waitForPageLoad stepKey="waitForNewNewsletterTemplatesPageLoaded"/>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="AssertAdminNewsletterTemplateFormActionGroup">
12+
<arguments>
13+
<argument name="name" type="string"/>
14+
<argument name="subject" type="string"/>
15+
<argument name="senderName" type="string"/>
16+
<argument name="senderEmail" type="string"/>
17+
<argument name="templateContent" type="string"/>
18+
</arguments>
19+
20+
<seeInField stepKey="seeTemplateNameField" userInput="{{name}}" selector="{{BasicFieldNewsletterSection.templateName}}"/>
21+
<seeInField stepKey="seeTemplateSubjectField" userInput="{{subject}}" selector="{{BasicFieldNewsletterSection.templateSubject}}"/>
22+
<seeInField stepKey="seeTemplateSenderNameField" userInput="{{senderName}}" selector="{{BasicFieldNewsletterSection.senderName}}"/>
23+
<seeInField stepKey="seeTemplateSenderEmailField" userInput="{{senderEmail}}" selector="{{BasicFieldNewsletterSection.senderEmail}}"/>
24+
<seeInField stepKey="seeTemplateContentField" userInput="{{templateContent}}" selector="{{NewsletterWYSIWYGSection.TextArea}}"/>
25+
</actionGroup>
26+
</actionGroups>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,11 @@
1515
<data key="senderEmail">admin@magento.com</data>
1616
<data key="textAreaContent">Some Test Content</data>
1717
</entity>
18+
<entity name="updatedNewsletter" type="cms_page">
19+
<data key="name" unique="suffix">Updated Newsletter Template</data>
20+
<data key="subject">Updated Newsletter Subject</data>
21+
<data key="senderName">Admin</data>
22+
<data key="senderEmail">admin@magento.com</data>
23+
<data key="textAreaContent">Some Updated Test Content</data>
24+
</entity>
1825
</entities>

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
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="AdminMarketingNewsletterTemplateUpdate">
12+
<annotations>
13+
<features value="Newsletter"/>
14+
<stories value="Newsletter Updating"/>
15+
<title value="Newsletter Updating Test"/>
16+
<description value="Admin should be able update created Newsletter Template"/>
17+
<group value="reports"/>
18+
<group value="mtf_migrated"/>
19+
</annotations>
20+
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterTemplatePage">
24+
<argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
25+
<argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.dataUiId}}"/>
26+
</actionGroup>
27+
<actionGroup ref="AdminNavigateToCreateNewsletterTemplatePageActionGroup" stepKey="navigateTiCreateNewsletterTemplatePage"/>
28+
<actionGroup ref="AdminMarketingCreateNewsletterTemplateActionGroup" stepKey="createNewsletterTemplate">
29+
<argument name="name" value="{{_defaultNewsletter.name}}"/>
30+
<argument name="subject" value="{{_defaultNewsletter.subject}}"/>
31+
<argument name="senderName" value="{{_defaultNewsletter.senderName}}"/>
32+
<argument name="senderEmail" value="{{_defaultNewsletter.senderEmail}}"/>
33+
<argument name="templateContent" value="{{_defaultNewsletter.textAreaContent}}"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminSearchNewsletterTemplateOnGridActionGroup" stepKey="findCreatedNewsletterTemplate">
36+
<argument name="name" value="{{_defaultNewsletter.name}}"/>
37+
<argument name="subject" value="{{_defaultNewsletter.subject}}"/>
38+
</actionGroup>
39+
<actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openCreatedNewsletterTemplate"/>
40+
</before>
41+
<after>
42+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterGridPage">
43+
<argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
44+
<argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterTemplate.dataUiId}}"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminSearchNewsletterTemplateOnGridActionGroup" stepKey="findCreatedNewsletterTemplateInGrid">
47+
<argument name="name" value="{{updatedNewsletter.name}}"/>
48+
<argument name="subject" value="{{updatedNewsletter.subject}}"/>
49+
</actionGroup>
50+
<actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
51+
<actionGroup ref="AdminMarketingDeleteNewsletterTemplateActionGroup" stepKey="deleteTemplate"/>
52+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
53+
</after>
54+
55+
<actionGroup ref="AdminMarketingCreateNewsletterTemplateActionGroup" stepKey="updateNewsletterTemplate">
56+
<argument name="name" value="{{updatedNewsletter.name}}"/>
57+
<argument name="subject" value="{{updatedNewsletter.subject}}"/>
58+
<argument name="senderName" value="{{updatedNewsletter.senderName}}"/>
59+
<argument name="senderEmail" value="{{updatedNewsletter.senderEmail}}"/>
60+
<argument name="templateContent" value="{{updatedNewsletter.textAreaContent}}"/>
61+
</actionGroup>
62+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
63+
<argument name="message" value="The newsletter template has been saved."/>
64+
<argument name="messageType" value="success"/>
65+
</actionGroup>
66+
<actionGroup ref="AdminSearchNewsletterTemplateOnGridActionGroup" stepKey="findCreatedNewsletterTemplate">
67+
<argument name="name" value="{{updatedNewsletter.name}}"/>
68+
<argument name="subject" value="{{updatedNewsletter.subject}}"/>
69+
</actionGroup>
70+
<actionGroup ref="AssertAdminCreatedNewsletterTemplateInGridActionGroup" stepKey="assertNewsletterInGrid">
71+
<argument name="name" value="{{updatedNewsletter.name}}"/>
72+
<argument name="subject" value="{{updatedNewsletter.subject}}"/>
73+
</actionGroup>
74+
<actionGroup ref="AdminSearchNewsletterTemplateOnGridActionGroup" stepKey="findUpdatedNewsletterTemplate">
75+
<argument name="name" value="Updated Newsletter Template"/>
76+
<argument name="subject" value="Updated Newsletter Subject"/>
77+
</actionGroup>
78+
<actionGroup ref="AdminMarketingOpenNewsletterTemplateFromGridActionGroup" stepKey="openTemplate"/>
79+
<actionGroup ref="AssertAdminNewsletterTemplateFormActionGroup" stepKey="assertNewsletterForm">
80+
<argument name="name" value="{{updatedNewsletter.name}}"/>
81+
<argument name="subject" value="{{updatedNewsletter.subject}}"/>
82+
<argument name="senderName" value="{{updatedNewsletter.senderName}}"/>
83+
<argument name="senderEmail" value="{{updatedNewsletter.senderEmail}}"/>
84+
<argument name="templateContent" value="{{updatedNewsletter.textAreaContent}}"/>
85+
</actionGroup>
86+
</test>
87+
</tests>

‎dev/tests/functional/tests/app/Magento/Newsletter/Test/TestCase/UpdateNewsletterTemplateTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<constraint name="Magento\Newsletter\Test\Constraint\AssertNewsletterSuccessCreateMessage" />
1717
<constraint name="Magento\Newsletter\Test\Constraint\AssertNewsletterInGrid" />
1818
<constraint name="Magento\Newsletter\Test\Constraint\AssertNewsletterForm" />
19+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1920
</variation>
2021
</testCase>
2122
</config>

0 commit comments

Comments
 (0)