Skip to content

Commit 54f6b8d

Browse files
nikshostkonikshostko
committed
Merge remote-tracking branch 'github-magento/MAGETWO-66489' into EPAM-PR-6
2 parents e70f1e6 + ee3d4c3 commit 54f6b8d

File tree

5 files changed

+99
-2
lines changed

5 files changed

+99
-2
lines changed

‎app/code/Magento/Email/Test/Mftf/ActionGroup/EmailTemplateActionGroup.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
<!--Create New Template -->
13+
<actionGroup name="CreateNewTemplate">
14+
<!--Click "Add New Template" button-->
15+
<click stepKey="clickAddNewTemplateButton" selector="{{EmailTemplatesSection.addNewTemplateButton}}"/>
16+
<waitForPageLoad stepKey="waitForNewEmailTemplatesPageLoaded"/>
17+
<!--Select value for "Template" drop-down menu in "Load default template" tab-->
18+
<selectOption selector="{{EmailTemplatesSection.templateDropDown}}" stepKey="selectValueFromTemplateDropDown" userInput="Registry Update"/>
19+
20+
<!--Fill in required fields in "Template Information" tab and click "Save Template" button-->
21+
<click stepKey="clickLoadTemplateButton" selector="{{EmailTemplatesSection.loadTemplateButton}}" after="selectValueFromTemplateDropDown"/>
22+
<fillField stepKey="fillTemplateNameField" selector="{{EmailTemplatesSection.templateNameField}}" userInput="{{EmailTemplate.templateName}}" after="clickLoadTemplateButton"/>
23+
<waitForLoadingMaskToDisappear stepKey="wait1"/>
24+
<click stepKey="clickSaveTemplateButton" selector="{{EmailTemplatesSection.saveTemplateButton}}"/>
25+
<waitForPageLoad stepKey="waitForNewTemplateCreated"/>
26+
</actionGroup>
27+
28+
<!--Delete created Template-->
29+
<actionGroup name="DeleteCreatedTemplate">
30+
<switchToPreviousTab stepKey="switchToPreviousTab"/>
31+
<seeInCurrentUrl stepKey="seeCreatedTemplateUrl" url="email_template/edit/id"/>
32+
<click stepKey="clickDeleteTemplateButton" selector="{{EmailTemplatesSection.deleteTemplateButton}}"/>
33+
<acceptPopup stepKey="acceptDeletingTemplatePopUp"/>
34+
<see stepKey="SeeSuccessfulMessage" userInput="You deleted the email template."/>
35+
<click stepKey="clickResetFilterButton" selector="{{EmailTemplatesSection.resetFilterButton}}"/>
36+
<waitForElementNotVisible selector="{{MarketingEmailTemplateSection.clearSearchTemplate(EmailTemplate.templateName)}}" stepKey="waitForSearchFieldCleared"/>
37+
</actionGroup>
38+
39+
</actionGroups>

‎app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EmailTemplate" type="template">
12+
<data key="templateName" unique="suffix">Template</data>
13+
</entity>
14+
</entities>

‎app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplatePage.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
11+
<page name="AdminEmailTemplatePage" url="/admin/email_template/" area="admin" module="Email">
12+
<section name="AdminEmailTemplatePageActionSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Email/Test/Mftf/Section/EmailTemplateSection.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
12+
<section name="MarketingEmailTemplateSection">
13+
<element name="searchTemplateField" type="input" selector="#systemEmailTemplateGrid_filter_code"/>
14+
<element name="searchButton" type="button" selector="//*[@title='Search' and @class='action-default scalable action-secondary']"/>
15+
<element name="createdTemplate" type="button" selector="//*[normalize-space() ='{{arg}}']" parameterized="true"/>
16+
<element name="clearSearchTemplate" type="input" selector="//*[@id='systemEmailTemplateGrid_filter_code' and @value='{{arg2}}']" parameterized="true"/>
17+
</section>
18+
19+
<section name="EmailTemplatesSection">
20+
<element name="addNewTemplateButton" type="button" selector="#add"/>
21+
<element name="templateDropDown" type="select" selector="#template_select"/>
22+
<element name="loadTemplateButton" type="button" selector="#load"/>
23+
<element name="templateNameField" type="input" selector="#template_code"/>
24+
<element name="saveTemplateButton" type="button" selector="#save"/>
25+
<element name="previewTemplateButton" type="button" selector="#preview"/>
26+
<element name="deleteTemplateButton" type="button" selector="#delete"/>
27+
<element name="resetFilterButton" type="button" selector="//span[contains(text(),'Reset Filter')]"/>
28+
</section>
29+
30+
</sections>

‎app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ require([
150150
} else {
151151
$('preview_type').value = <?= (int) $block->getTemplateType() ?>;
152152
}
153-
if (typeof tinyMCE == 'undefined' || !tinyMCE.getInstanceById('template_text')) {
153+
if (typeof tinyMCE == 'undefined' || !tinyMCE.get('template_text')) {
154154
$('preview_text').value = $('template_text').value;
155155
} else {
156-
$('preview_text').value = tinyMCE.getInstanceById('template_text').getHTML();
156+
$('preview_text').value = tinyMCE.get('template_text').getHTML();
157157
}
158158

159159
if ($('template_styles') != undefined) {

0 commit comments

Comments
 (0)