Skip to content

Commit 63d41a9

Browse files
fascinosumfascinosum
authored
Merge pull request #97 from magento-trigger/AC-252
[TRIGER] AC-252
2 parents 8082747 + 0554b9d commit 63d41a9

File tree

34 files changed

+91
-159
lines changed

34 files changed

+91
-159
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
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-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
14-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
15-
</actionGroup>
13+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
1614
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
1715
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1816
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
@@ -21,9 +19,7 @@
2119
</before>
2220
<after>
2321
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
24-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26-
</actionGroup>
22+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2723
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2824
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
2925
<magentoCLI command="cache:clean config" stepKey="flushCache"/>

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
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-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
14-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
15-
</actionGroup>
13+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
1614
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
1715
<magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
1816
<magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
@@ -21,9 +19,7 @@
2119
</before>
2220
<after>
2321
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
24-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
25-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
26-
</actionGroup>
22+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2723
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
2824
<magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
2925
<magentoCLI command="cache:clean config" stepKey="flushCache"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending"/>
6767
<click selector="{{AdminProductGridActionSection.productName(SimpleProduct.name)}}" stepKey="navigateToEditProduct"/>
6868
<waitForPageLoad stepKey="waitForPageLoad9"/>
69-
<dontSeeElement selector="{{PageBuilderProductAttribute.PageBuilderBtn($$myProductAttributeCreation.attribute_code$$)}}" stepKey="dontSeeTinyMCE4"/>
70-
<seeElement selector="{{ProductAttributeWYSIWYGSection.TextArea($$myProductAttributeCreation.attribute_code$$)}}" stepKey="seeTextAreaAttribute"/>
69+
<dontSeeElement selector="{{PageBuilderProductAttribute.PageBuilderBtn($$myProductAttributeCreation.attribute_code$$)}}" stepKey="dontSeeTinyMCE"/>
70+
<seeElement selector="{{AdminProductFormSection.divByDataIndex($$myProductAttributeCreation.attribute_code$$)}} {{TinyMCESection.Content}}" stepKey="seeTextAreaAttribute"/>
7171
</test>
7272
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@
6767
<actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending"/>
6868
<click selector="{{AdminProductGridActionSection.productName(SimpleProduct.name)}}" stepKey="navigateToEditProduct"/>
6969
<waitForPageLoad stepKey="waitForPageLoad9"/>
70-
<seeElement selector="{{ProductAttributeWYSIWYGSection.TinyMCE4($$myProductAttributeCreation.attribute_code$$)}}" stepKey="seeTinyMCE4Attribute"/>
70+
<seeElement selector="{{AdminProductFormSection.divByDataIndex($$myProductAttributeCreation.attribute_code$$)}} {{TinyMCESection.TinyMCE}}" stepKey="seeTinyMCEAttribute"/>
7171
</test>
7272
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanUpgradeTextEditorProductAttributeToPageBuilderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<waitForPageLoad stepKey="waitForPageLoad3"/>
4141
<amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
4242
<waitForPageLoad stepKey="waitForPageLoad4"/>
43-
<seeElement selector="{{ProductAttributeWYSIWYGSection.TinyMCE4($$myProductAttributeCreation.attribute_code$$)}}" stepKey="waitForPageLoad10"/>
43+
<seeElement selector="{{AdminProductFormSection.divByDataIndex($$myProductAttributeCreation.attribute_code$$)}} {{TinyMCESection.TinyMCE}}" stepKey="waitForPageLoad10"/>
4444
<actionGroup ref="FillMainProductFormActionGroup" stepKey="fillMainProductForm">
4545
<argument name="product" value="SimpleProduct"/>
4646
</actionGroup>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
</annotations>
2323
<before>
2424
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
26-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
27-
</actionGroup>
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE"/>
2826
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2927
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
3028
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
</annotations>
2323
<before>
2424
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
25-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
26-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
27-
</actionGroup>
25+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2826
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2927
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
3028
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
</annotations>
2424
<before>
2525
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="configWYSIWYG"/>
26-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
27-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
28-
</actionGroup>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2927
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
3028
<createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
3129
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
</annotations>
2424
<before>
2525
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="configWYSIWYG"/>
26-
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" >
27-
<argument name="TinyMCEValue" value="{{EnableTinyMCE.value}}"/>
28-
</actionGroup>
26+
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
2927
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
3028
<createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
3129
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
@@ -112,9 +110,9 @@
112110
<seeElement selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSBlockStage"/>
113111
<seeElement selector="{{TextOnStage.text('1', TinyMCEVariableBaseURL.editPanelValue)}}" stepKey="seeVariableCMSBlockStage"/>
114112
<seeElement selector="{{TextOnStage.text('1', TinyMCEWidgetCMSPageLink.editPanelValue)}}" stepKey="seeWidgetCMSBlockStage"/>
115-
<seeElement selector="{{TextOnStage.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSBlockStage"/>
116-
<seeElement selector="{{TextOnStage.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSBlockStage"/>
117-
<seeElement selector="{{TextOnStage.base('1')}}{{CmsWYSIWYGSection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSBlockStage"/>
113+
<seeElement selector="{{TextOnStage.base('1')}}{{TinyMCESection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSBlockStage"/>
114+
<seeElement selector="{{TextOnStage.base('1')}}{{TinyMCESection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSBlockStage"/>
115+
<seeElement selector="{{TextOnStage.base('1')}}{{TinyMCESection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSBlockStage"/>
118116
<!-- Add Block to CMS Page -->
119117
<comment userInput="Add Block to CMS Page" stepKey="commentAddBlockToCMSPage"/>
120118
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
@@ -143,9 +141,9 @@
143141
<seeElement selector="{{TextOnStorefront.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSPageStage"/>
144142
<seeElement selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="seeVariableCMSPageStage"/>
145143
<seeElement selector="{{TextOnStorefront.textWidget('1', _ENV.MAGENTO_BASE_URL, $$createPreReqCMSPage.identifier$$)}}" stepKey="seeWidgetCMSPageStage"/>
146-
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSPageStage"/>
147-
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSPageStage"/>
148-
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSPageStage"/>
144+
<seeElement selector="{{TextOnStorefront.base('1')}}{{TinyMCESection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSPageStage"/>
145+
<seeElement selector="{{TextOnStorefront.base('1')}}{{TinyMCESection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSPageStage"/>
146+
<seeElement selector="{{TextOnStorefront.base('1')}}{{TinyMCESection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSPageStage"/>
149147
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
150148
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
151149
<!-- Validate CMS Page Storefront -->
@@ -156,9 +154,9 @@
156154
<seeElement selector="{{TextOnStorefront.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTextCMSPageStorefront"/>
157155
<seeElement selector="{{TextOnStorefront.text('1', _ENV.MAGENTO_BASE_URL)}}" stepKey="seeVariableCMSPageStorefront"/>
158156
<seeElement selector="{{TextOnStorefront.textWidget('1', _ENV.MAGENTO_BASE_URL, $$createPreReqCMSPage.identifier$$)}}" stepKey="seeWidgetCMSPageStorefront"/>
159-
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSPageStorefront"/>
160-
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSPageStorefront"/>
161-
<seeElement selector="{{TextOnStorefront.base('1')}}{{CmsWYSIWYGSection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSPageStorefront"/>
157+
<seeElement selector="{{TextOnStorefront.base('1')}}{{TinyMCESection.imageSource(ImageUpload3.fileName)}}" stepKey="seeImageFileNameCMSPageStorefront"/>
158+
<seeElement selector="{{TextOnStorefront.base('1')}}{{TinyMCESection.imageSource(ImageUpload3.extension)}}" stepKey="seeImageExtensionCMSPageStorefront"/>
159+
<seeElement selector="{{TextOnStorefront.base('1')}}{{TinyMCESection.ImageAlt(ImageUpload3.content)}}" stepKey="seeImageAltCMSPageStorefront"/>
162160
<!-- Click Page Link Widget -->
163161
<comment userInput="Click Page Link Widget" stepKey="clickClickPageLinkWidget"/>
164162
<click selector="{{TextOnStorefront.textWidget('1', _ENV.MAGENTO_BASE_URL, $$createPreReqCMSPage.identifier$$)}}" stepKey="clickWidgetCMSPageStorefront"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<features value="PageBuilder"/>
1313
<stories value="Block Content"/>
1414
<title value="Render Banner 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 Banner content type through the Block content type with TinyMCE4 and Wysiwyg Disabled By Default."/>
15+
<description value="Verify that users are able to successfully render and use the Banner content type through the Block content type with TinyMCE and Wysiwyg Disabled By Default."/>
1616
<severity value="AVERAGE"/>
1717
<testCaseId value="MC-15193"/>
1818
<useCaseId value="MC-13769"/>

0 commit comments

Comments
 (0)