Skip to content

Commit cf850d6

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MAGETWO-73447' into 2.2-develop-pr47
2 parents 4a4fe88 + 3c6509f commit cf850d6

File tree

7 files changed

+127
-2
lines changed

7 files changed

+127
-2
lines changed

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

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<!--Create New Email Template -->
12+
<actionGroup name="AdminCreateNewEmailTemplate">
13+
<arguments>
14+
<argument name="emailTemplate" defaultValue="EmailTemplate"/>
15+
</arguments>
16+
<!--Click "Add New Template" button-->
17+
<click selector="{{AdminMainActionsSection.add}}" stepKey="clickAddNewTemplateButton"/>
18+
<waitForPageLoad stepKey="waitForNewEmailTemplatePageLoaded"/>
19+
<!--Select value for "Template" drop-down menu in "Load default template" tab-->
20+
<selectOption selector="{{AdminEmailTemplateEditSection.templateDropDown}}" userInput="Registry Update" stepKey="selectValueFromTemplateDropDown"/>
21+
<!--Fill in required fields in "Template Information" tab and click "Save Template" button-->
22+
<click selector="{{AdminEmailTemplateEditSection.loadTemplateButton}}" stepKey="clickLoadTemplateButton"/>
23+
<waitForElementVisible selector="{{AdminEmailTemplateEditSection.templateNameField}}" stepKey="waitForTemplateNameFieldVisible"/>
24+
<fillField selector="{{AdminEmailTemplateEditSection.templateNameField}}" userInput="{{emailTemplate.templateName}}" stepKey="fillTemplateNameField"/>
25+
<fillField selector="{{AdminEmailTemplateEditSection.templateSubjectField}}" userInput="{{emailTemplate.templateSubject}}" stepKey="fillTemplateSubjectField"/>
26+
<waitForPageLoad stepKey="waitForTemplateSaveButtonVisible"/>
27+
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveTemplateButton"/>
28+
<waitForPageLoad stepKey="waitForNewTemplateCreated"/>
29+
<see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the email template." stepKey="seeSuccessMessageAfterSave"/>
30+
</actionGroup>
31+
32+
<!--Delete Email Template-->
33+
<actionGroup name="AdminDeleteEmailTemplate">
34+
<arguments>
35+
<argument name="emailTemplate" defaultValue="EmailTemplate"/>
36+
</arguments>
37+
<seeInCurrentUrl url="email_template/edit/id" stepKey="seeCreatedTemplateUrl"/>
38+
<click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDeleteTemplateButton"/>
39+
<acceptPopup stepKey="acceptDeletingTemplatePopUp"/>
40+
<see userInput="You deleted the email template." stepKey="seeSuccessfulMessage"/>
41+
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickResetFilterButton"/>
42+
<waitForElementNotVisible selector="{{AdminEmailTemplateGridSection.templateRowWithName(emailTemplate.templateName)}}" stepKey="waitForSearchFieldCleared"/>
43+
</actionGroup>
44+
</actionGroups>

‎app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="EmailTemplate" type="template">
12+
<data key="templateName" unique="suffix">Template</data>
13+
<data key="templateSubject" unique="suffix">Template Subject</data>
14+
</entity>
15+
</entities>

‎app/code/Magento/Email/Test/Mftf/Page/AdminEmailTemplateCreatePage.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+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11+
<page name="AdminEmailTemplateCreatePage" url="/admin/email_template/new/" area="admin" module="Magento_Email">
12+
<section name="AdminEmailTemplateEditSection"/>
13+
<section name="AdminMainActionsSection"/>
14+
</page>
15+
</pages>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11+
<page name="AdminEmailTemplateGridPage" url="/admin/email_template/" area="admin" module="Magento_Email">
12+
<section name="AdminEmailTemplateGridSection"/>
13+
<section name="AdminMainActionsSection"/>
14+
<section name="AdminMessagesSection"/>
15+
<section name="AdminDataGridHeaderSection"/>
16+
<section name="AdminDataGridTableSection"/>
17+
</page>
18+
</pages>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminEmailTemplateEditSection">
12+
<element name="templateDropDown" type="select" selector="#template_select"/>
13+
<element name="loadTemplateButton" type="button" selector="#load"/>
14+
<element name="templateNameField" type="input" selector="#template_code"/>
15+
<element name="templateSubjectField" type="input" selector="#template_subject"/>
16+
<element name="previewTemplateButton" type="button" selector="#preview"/>
17+
</section>
18+
</sections>

‎app/code/Magento/Email/Test/Mftf/Section/AdminEmailTemplateGridSection.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+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminEmailTemplateGridSection">
12+
<element name="searchTemplateField" type="input" selector="#systemEmailTemplateGrid_filter_code"/>
13+
<element name="templateRowWithName" type="input" selector="//*[@id='systemEmailTemplateGrid_filter_code' and @value='{{arg2}}']" parameterized="true"/>
14+
</section>
15+
</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)