Skip to content

Commit 1033908

Browse files
dhorytskyidhorytskyi
committed
Merge branch '2.4-develop' of https://github.com/magento/magento2ce into MC-38263
2 parents 3ed6dce + 867f3e3 commit 1033908

File tree

50 files changed

+167
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+167
-136
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/WYSIWYGConfigData.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
<before>
1212
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
1313
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
14-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
14+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
15+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
16+
</actionGroup>
1517
</before>
1618
<annotations>
1719
<features value="Catalog"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26+
</actionGroup>
2527
</before>
2628

2729
<after>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateTextEditorProductAttributeTest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@
1313
<features value="Catalog"/>
1414
<stories value="Create product Attribute"/>
1515
<title value="Admin create text editor product attribute test"/>
16-
<description value="Create text editor product attribute with TinyMCE4 enabled"/>
16+
<description value="Create text editor product attribute with TinyMCE enabled"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-6338"/>
1919
<group value="catalog"/>
2020
</annotations>
2121
<before>
2222
<!-- Enable WYSIWYG editor -->
23-
<magentoCLI command="config:set {{EnableWYSIWYG.path}} {{EnableWYSIWYG.value}}" stepKey="enableWYSIWYG"/>
23+
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
2424

2525
<!-- Enable TinyMCE 4 -->
26-
<magentoCLI command="config:set {{EnableTinyMCE4.path}} {{EnableTinyMCE4.value}}" stepKey="enableTinyMCE4"/>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
27+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
28+
</actionGroup>
2729

2830
<!-- Login as admin -->
2931
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
23+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
24+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
25+
</actionGroup>
2426
<createData stepKey="myProductAttributeCreation" entity="productAttributeWysiwyg"/>
2527
<createData stepKey="myProductAttributeSetAssign" entity="AddToDefaultSet">
2628
<requiredEntity createDataKey="myProductAttributeCreation"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4"/>
23+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE">
24+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
25+
</actionGroup>
2426
</before>
2527
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
2628
<waitForPageLoad stepKey="wait"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyDefaultWYSIWYGToolbarOnProductTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4"/>
23+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE">
24+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
25+
</actionGroup>
2426
</before>
2527
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToProduct"/>
2628
<waitForPageLoad stepKey="wait"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest">
11+
<test name="VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest">
1212
<annotations>
1313
<features value="Catalog"/>
1414
<stories value="MAGETWO-72137-Apply new WYSIWYG on Categories Page"/>
1515
<group value="Catalog"/>
16-
<title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Catalog Page"/>
17-
<description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Catalog Page"/>
16+
<title value="Admin should see TinyMCE is the native WYSIWYG on Catalog Page"/>
17+
<description value="Admin should see TinyMCE is the native WYSIWYG on Catalog Page"/>
1818
<severity value="CRITICAL"/>
1919
<testCaseId value="MAGETWO-82551"/>
2020
</annotations>
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26+
</actionGroup>
2527
</before>
2628
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToNewCatalog"/>
2729
<waitForLoadingMaskToDisappear stepKey="wait2" />
@@ -30,7 +32,7 @@
3032
<click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
3133
<waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
3234
<seeElement selector="{{CatalogWYSIWYGSection.ShowHideBtn}}" stepKey="seeShowHideBtn" />
33-
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
35+
<actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE"/>
3436
<executeJS function="tinyMCE.get('category_form_description').setContent('Hello World!');" stepKey="executeJSFillContent"/>
3537
<click selector="{{CatalogWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn" />
3638
<waitForElementVisible selector="{{TinyMCESection.InsertImageBtn}}" stepKey="waitForInsertImage" />

‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml renamed to ‎app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEIsNativeWYSIWYGOnProductTest.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,22 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest">
10+
<test name="VerifyTinyMCEIsNativeWYSIWYGOnProductTest">
1111
<annotations>
1212
<features value="Catalog"/>
1313
<stories value="MAGETWO-72114-TinyMCE v4.6 as a native WYSIWYG editor"/>
1414
<group value="Catalog"/>
15-
<title value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Product Page"/>
16-
<description value="Admin should see TinyMCEv4.6 is the native WYSIWYG on Product Page"/>
15+
<title value="Admin should see TinyMCE is the native WYSIWYG on Product Page"/>
16+
<description value="Admin should see TinyMCE is the native WYSIWYG on Product Page"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-81819"/>
1919
</annotations>
2020
<before>
2121
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2222
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
23-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
23+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
24+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
25+
</actionGroup>
2426
</before>
2527
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
2628
<waitForPageLoad stepKey="wait1"/>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/ClearWidgetsFromCMSContentActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<waitForElementNotVisible selector="{{CmsWYSIWYGSection.CheckIfTabExpand}}" stepKey="waitForTabExpand"/>
2020
<executeJS function="jQuery('[id=\'cms_page_form_content_ifr\']').attr('name', 'preview-iframe')" stepKey="setPreviewFrameName"/>
2121
<switchToIFrame selector="preview-iframe" stepKey="switchToIframe"/>
22-
<fillField selector="{{TinyMCESection.EditorContent}}" userInput="Hello TinyMCE4!" stepKey="clearWidgets"/>
22+
<fillField selector="{{TinyMCESection.EditorContent}}" userInput="Hello TinyMCE!" stepKey="clearWidgets"/>
2323
<switchToIFrame stepKey="switchOutFromIframe"/>
24-
<executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE4!');" stepKey="executeJSFillContent1"/>
24+
<executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE!');" stepKey="executeJSFillContent1"/>
2525
<click selector="{{InsertWidgetSection.save}}" stepKey="saveWidget"/>
2626
<waitForPageLoad stepKey="waitSaveToBeApplied"/>
2727
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the page." stepKey="seeSaveSuccess"/>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/CliEnableTinyMCEActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="CliEnableTinyMCEActionGroup">
12+
<annotations>
13+
<description>Enable Tiny MCE by CLI command config:set</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="TinyMCEValue" type="string"/>
17+
</arguments>
18+
19+
<magentoCLI command="config:set {{EnableTinyMCE.path}} {{TinyMCEValue}}" stepKey="enableTinyMCE"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
<data key="scope_id">0</data>
1919
<data key="value">disabled</data>
2020
</entity>
21-
<entity name="WysiwygTinyMCE4Enable">
21+
<entity name="EnableTinyMCE">
2222
<data key="path">cms/wysiwyg/editor</data>
2323
<data key="scope_id">0</data>
24+
<data key="label">Yes</data>
2425
<data key="value">mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</data>
2526
</entity>
2627
</entities>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2424
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
26+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
27+
</actionGroup>
2628
</before>
2729
<actionGroup ref="AssignBlockToCMSPage" stepKey="assignBlockToCMSPage">
2830
<argument name="Block" value="$$createPreReqBlock$$"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26+
</actionGroup>
2527
</before>
2628
<after>
2729
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddLargeImageToWYSIWYGCMSTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26+
</actionGroup>
2527
</before>
2628
<after>
2729
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" />

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2424
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
26+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
27+
</actionGroup>
2628
</before>
2729
<!--Create Custom Variable-->
2830
<actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
<before>
2020
<actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
2121
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
22-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
22+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
23+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
24+
</actionGroup>
2325
</before>
2426
<!--Create Custom Variable-->
2527
<actionGroup ref="CreateCustomVariableActionGroup" stepKey="createCustomVariable" />

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2424
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
26+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
27+
</actionGroup>
2628
</before>
2729
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
2830
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<before>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26+
</actionGroup>
2527
</before>
2628
<!--Main test-->
2729
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2424
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
26+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
27+
</actionGroup>
2628
</before>
2729
<!--Main test-->
2830
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
2222
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2323
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
24-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26+
</actionGroup>
2527
<actionGroup ref="ConfigAdminAccountSharingActionGroup" stepKey="allowAdminShareAccount"/>
2628
</before>
2729
<!--Main test-->

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
</createData>
2626
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2727
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
28-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
28+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
29+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
30+
</actionGroup>
2931
</before>
3032
<!--Main test-->
3133
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
</createData>
2828
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2929
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
30-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
30+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
31+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
32+
</actionGroup>
3133
</before>
3234
<!--Main test-->
3335
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
</createData>
2727
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2828
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
29-
<actionGroup ref="CliEnableTinyMCE4ActionGroup" stepKey="switchToTinyMCE4" />
29+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
30+
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
31+
</actionGroup>
3032
</before>
3133
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
3234
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>

0 commit comments

Comments
 (0)