Skip to content

Commit 7682c7b

Browse files
committed
AC-233: Refactor core MFTF TinyMCE ActionGroup
Changed stepKey
1 parent 7510193 commit 7682c7b

File tree

25 files changed

+70
-38
lines changed

25 files changed

+70
-38
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<before>
1111
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
1212
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
13-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
13+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="switchToTinyMCE" >
14+
<argument name="TinyMCEValue" value="{{TinyMCE.value}}"/>
15+
</actionGroup>
1416
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
1517
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1618
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
@@ -19,7 +21,9 @@
1921
</before>
2022
<after>
2123
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
22-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="switchToTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{TinyMCE.value}}"/>
26+
</actionGroup>
2327
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2428
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
2529
<magentoCLI command="cache:clean config" stepKey="flushCache"/>

app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<before>
1111
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
1212
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
13-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
13+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="switchToTinyMCE" >
14+
<argument name="TinyMCEValue" value="{{TinyMCE.value}}"/>
15+
</actionGroup>
1416
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
1517
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1618
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
@@ -19,7 +21,9 @@
1921
</before>
2022
<after>
2123
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
22-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
24+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="switchToTinyMCE" >
25+
<argument name="TinyMCEValue" value="{{TinyMCE.value}}"/>
26+
</actionGroup>
2327
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2428
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
2529
<magentoCLI command="cache:clean config" stepKey="flushCache"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterWYSIWYGDisabledInlineEditTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<remove keyForRemoval="enableWYSIWYG"/>
25-
<remove keyForRemoval="enableTinyMCE4"/>
25+
<remove keyForRemoval="switchToTinyMCE"/>
2626
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
2727
</before>
2828
<after>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWYSIWYGDisabledInlineEditTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<remove keyForRemoval="enableWYSIWYG"/>
25-
<remove keyForRemoval="enableTinyMCE4"/>
25+
<remove keyForRemoval="switchToTinyMCE"/>
2626
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
2727
</before>
2828
<after>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightWYSIWYGDisabledInlineEditTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<remove keyForRemoval="enableWYSIWYG"/>
25-
<remove keyForRemoval="enableTinyMCE4"/>
25+
<remove keyForRemoval="switchToTinyMCE"/>
2626
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
2727
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disableWYSIWYG"/>
2828
</before>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
</annotations>
2323
<before>
2424
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
25-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="switchToTinyMCE" >
26+
<argument name="TinyMCEValue" value="{{TinyMCE.value}}"/>
27+
</actionGroup>
2628
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2729
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2830
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
</annotations>
2323
<before>
2424
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
25-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="switchToTinyMCE" >
26+
<argument name="TinyMCEValue" value="{{TinyMCE.value}}"/>
27+
</actionGroup>
2628
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2729
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2830
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWYSIWYGDisabledInlineEditTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323
<before>
2424
<remove keyForRemoval="enableWYSIWYG"/>
25-
<remove keyForRemoval="enableTinyMCE4"/>
25+
<remove keyForRemoval="switchToTinyMCE"/>
2626
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
2727
</before>
2828
<after>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygDisabledByDefaultTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
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="BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygDisabledByDefaultTest" extends="BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest">
10+
<test name="BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest" extends="BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Block Content"/>
14-
<title value="Render Text Through Block Content Type With TinyMCE4 and Wysiwyg Disabled By Default"/>
15-
<description value="Verify that users are able to successfully render and use the Text content type through the Block content type with TinyMCE4 and Wysiwyg Disabled By Default."/>
14+
<title value="Render Text Through Block Content Type With TinyMCE and Wysiwyg Disabled By Default"/>
15+
<description value="Verify that users are able to successfully render and use the Text content type through the Block content type with TinyMCE and Wysiwyg Disabled By Default."/>
1616
<severity value="AVERAGE"/>
1717
<testCaseId value="MC-15175"/>
1818
<useCaseId value="MC-13769"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCE4WysiwygDisabledByDefaultTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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="BlockRenderBannerThroughBlockContentTypeTinyMCE4WysiwygDisabledByDefaultTest" extends="BlockRenderBannerThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest">
10+
<test name="BlockRenderBannerThroughBlockContentTypeTinyMCE4WysiwygDisabledByDefaultTest" extends="BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Block Content"/>

0 commit comments

Comments
 (0)