Skip to content

Commit a273738

Browse files
fascinosumfascinosum
authored
Merge pull request #100 from magento-trigger/AC-229
[Trigger] AC-229: Upgrade and remove tinymce4
2 parents ac1227d + 4d2e346 commit a273738

File tree

33 files changed

+256
-160
lines changed

33 files changed

+256
-160
lines changed

‎app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
4242
$config->addData(
4343
[
4444
'tinymce' => [
45-
'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheightselect | forecolor backcolor ' .
45+
'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
4646
'| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
4747
'| link image table charmap',
4848

@@ -57,15 +57,11 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
5757
'media',
5858
'noneditable',
5959
'table',
60-
'contextmenu',
6160
'paste',
6261
'code',
6362
'help',
6463
'table',
65-
'textcolor',
66-
'image',
67-
'colorpicker',
68-
'lineheight'
64+
'image'
6965
]
7066
),
7167
'content_css' => [

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGActionGroup.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
<argument name="url" type="string"/>
1414
<argument name="textToDisplay" type="string"/>
1515
<argument name="title" type="string" defaultValue=""/>
16-
<argument name="wysiwygArea" defaultValue="{{WYSIWYGOnPageBuilderInline.notCss}}" type="string"/>
1716
</arguments>
1817
<comment userInput="insertLinkInWYSIWYG" stepKey="comment"/>
19-
<waitForElementVisible selector="{{wysiwygArea}} {{section.InsertLink}}" stepKey="waitForInsertLinkButton"/>
20-
<click selector="{{wysiwygArea}} {{section.InsertLink}}" stepKey="clickInsertLinkButton"/>
18+
<waitForElementVisible selector="{{section.InsertLink}}" stepKey="waitForInsertLinkButton"/>
19+
<click selector="{{section.InsertLink}}" stepKey="clickInsertLinkButton"/>
2120
<waitForPageLoad stepKey="waitForPageLoad"/>
2221
<waitForElementVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInsertLinkModal"/>
2322
<fillField selector="{{WYSIWYGInsertLinkModal.urlInput}}" userInput="{{url}}" stepKey="insertUrl"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<element name="panelFieldHelperText" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-note') or contains(@class,'image-upload-requirements')]"/>
3434
<element name="panelFieldTooltip" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::a[contains(@class,'admin__field-tooltip-action')]"/>
3535
<element name="panelFieldTooltipContent" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
36-
<element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'mce-tinymce')]" parameterized="true"/>
37-
<element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'mce-tinymce')]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
36+
<element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]" parameterized="true"/>
37+
<element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
3838
<element name="panelMultiSelectFieldControl" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] [data-role='advanced-select']" parameterized="true"/>
3939
<element name="panelMultiSelectFieldControlInput" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] .admin__action-multiselect-search" parameterized="true"/>
4040
<element name="panelMultiSelectFieldControlResult" type="input" selector="//aside//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}']//div[contains(@class,'action-menu-item')]//span[.='{{arg3}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{slideIndex}}]//*[contains(@class, 'magento-placeholder') and contains(@class, 'magento-widget')]" parameterized="true"/>
3030
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{slideIndex}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
3131
<element name="tinymceInFocus" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{slideIndex}}]//div[contains(@class, 'inline-wysiwyg') and contains(@class, 'mce-edit-focus')]" parameterized="true"/>
32-
<element name="slideOverflowPropertyJS" type="button" selector="return window.getComputedStyle(document.querySelectorAll('[data-content-type=slide] div.mce-tinymce-inline')[{{tinyMCEIndex}}]).overflow" parameterized="true"/>
32+
<element name="slideOverflowPropertyJS" type="button" selector="return window.getComputedStyle(document.querySelectorAll('.element-children.content-type-container.slider-container')[{{tinyMCEIndex}}]).overflow" parameterized="true"/>
3333
<!-- Appearance Configuration -->
3434
<element name="appearance" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-appearance='{{appearance}}']" parameterized="true"/>
3535
<element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-slide-name='{{slideName}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload Image']" parameterized="true"/>
5050
<element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
5151
<element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='{{arg1}}' and contains(@class,'inline-wysiwyg')])[{{arg2}}]" parameterized="true"/>
52-
<element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'mce-tinymce-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'mce-tinymce-inline')]]" parameterized="true"/>
52+
<element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-tinymce-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-tinymce-inline')]]" parameterized="true"/>
5353
<element name="inlineTextAreaEditor" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//textarea[@class='inline-wysiwyg-textarea']" parameterized="true"/>
5454
<element name="rootContainer" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-root-container&quot;)])[{{index}}]" parameterized="true"/>
5555
<element name="rootContainerPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-root-container')])[{{index}}][contains(@class,'empty-container')]//div[contains(@class,'empty-placeholder')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
3838
<element name="wysiwyg" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]" parameterized="true"/>
3939
<element name="contentJS" type="text" selector="document.querySelectorAll('div[data-content-type=text] .inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
40+
<element name="headingsList" type="text" selector="div[title='Headings']"/>
41+
<element name="heading1Style" type="text" selector="div[title='Heading 1']"/>
42+
<element name="emptyTextInHeading1Style" selector="(//div[contains(@class,'pagebuilder-text')])[1]//h1" type="text" />
4043
<!-- Advanced Configuration -->
4144
<element name="advancedConfigurationPath" type="text" parameterized="true" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg1}}]/div[@data-pb-style]"/>
4245
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'text-align: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<element name="textInImportantStyle" type="text" selector="//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg1}}']" parameterized="true"/>
2626
<element name="emptyTextInImportantStyle" type="text" selector="//div[@data-content-type='text'][{{arg1}}]//div[@class='cms-content-important'][not(*)]" parameterized="true"/>
2727
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-content-type=text][data-element=main]')[{{arg1}} - 1]" parameterized="true"/>
28+
<element name="emptyTextInHeading1Style" selector="//div[@data-content-type='text'][1]//h1" type="text" />
2829
<!-- Advanced Configuration -->
2930
<element name="advancedConfigurationPath" type="text" parameterized="true" selector="(//div[@data-content-type=&quot;text&quot;])[{{arg1}}]"/>
3031
<element name="alignment" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="WYSIWYGInsertLinkModal">
11-
<element name="modal" type="input" selector="[aria-label='Insert link']"/>
11+
<element name="modal" type="input" selector=".tox-dialog"/>
1212
<element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
1313
<element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
14-
<element name="urlInput" type="input" selector="//div[@aria-label='Insert link']//input[ancestor::div[label[.='Url']]]"/>
15-
<element name="browseMediaGalleryButton" type="button" selector="//div[@aria-label='Insert link']//button[ancestor::div[label[.='Url']]]"/>
16-
<element name="textToDisplayInput" type="input" selector="//div[@aria-label='Insert link']//input[ancestor::div[label[.='Text to display']]]"/>
17-
<element name="titleInput" type="input" selector="//div[@aria-label='Insert link']//input[ancestor::div[label[.='Title']]]"/>
18-
<element name="targetInput" type="input" selector="//div[@aria-label='Insert link']//button[ancestor::div[label[.='Target']]]"/>
19-
<element name="okButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Ok']"/>
14+
<element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
15+
<element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
16+
<element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
17+
<element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
18+
<element name="targetInput" type="input" selector="button[title='Open link in...']"/>
19+
<element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
2020
<element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
2121
</section>
2222
</sections>

0 commit comments

Comments
 (0)