Skip to content

Commit 664c2d2

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-99378' into 2.3-develop-pr22
2 parents 47c97a5 + a285d9b commit 664c2d2

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminSlideOutDialogSection">
11-
<element name="closeButton" type="button" selector=".modal-slide._show [data-role='closeBtn']" timeout="30"/>
11+
<element name="closeButton" type="button" selector=".modal-slide._show [data-role=&quot;closeBtn&quot;]" timeout="30"/>
1212
<element name="cancelButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']" timeout="30"/>
1313
<element name="doneButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']" timeout="30"/>
1414
<element name="saveButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']" timeout="30"/>
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="WysiwygEnabledByDefault">
12+
<data key="path">cms/wysiwyg/enabled</data>
13+
<data key="scope_id">0</data>
14+
<data key="value">enabled</data>
15+
</entity>
16+
<entity name="WysiwygDisabledByDefault">
17+
<data key="path">cms/wysiwyg/enabled</data>
18+
<data key="scope_id">0</data>
19+
<data key="value">hidden</data>
20+
</entity>
21+
<entity name="WysiwygTinyMCE3Enable">
22+
<data key="path">cms/wysiwyg/editor</data>
23+
<data key="scope_id">0</data>
24+
<data key="value">Magento_Tinymce3/tinymce3Adapter</data>
25+
</entity>
26+
<entity name="WysiwygTinyMCE4Enable">
27+
<data key="path">cms/wysiwyg/editor</data>
28+
<data key="scope_id">0</data>
29+
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</data>
30+
</entity>
31+
</entities>

0 commit comments

Comments
 (0)