Skip to content

Commit 0ee2a29

Browse files
committed
#419: Nested Links If User Adds Link Attribute & Link Widget to Banner/Slide, backward compatibility, mftf align.
1 parent a582931 commit 0ee2a29

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<argument name="page" value="$$createCMSPageA.identifier$$"/>
172172
</actionGroup>
173173
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnInlineWYSIWYGEditorArea"/>
174-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidWidgetProperty.stageErrorMessage)}}" stepKey="seeNestingWidgetCorrectErrorModal"/>
174+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidWidgetProperty.stageErrorMessage)}}" stepKey="waitForNestingWidgetCorrectErrorModal"/>
175175
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingWidgetModal"/>
176176
<!-- Checks for Widget (placeholder) within the WYSIWYG with regex -->
177177
<executeJS function="return (/&lt;span.*(class=)(&quot;|\').*((magento-placeholder).*(magento-widget)|(magento-widget).*(magento-placeholder)).*&lt;\/span&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfWidgetInWysiwygBoolean"/>
@@ -190,7 +190,7 @@
190190
<argument name="wysiwygArea" value=""/>
191191
</actionGroup>
192192
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnInlineWYSIWYGEditorAreaAddLink"/>
193-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeNestingLinkCorrectErrorModal"/>
193+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForNestingLinkCorrectErrorModal"/>
194194
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>
195195
<!-- Checks for A tags within the WYSIWYG with regex -->
196196
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfLinkInWysiwygBoolean"/>
@@ -221,7 +221,7 @@
221221
<waitForElementNotVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInlineWYSIWYGInsertLinkModalGone"/>
222222
<waitForPageLoad stepKey="waitForInlineWYSIWYGStorageRoot"/>
223223
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnInlineWYSIWYGEditorAreaAddImageLink"/>
224-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeNestingImageLinkCorrectErrorModal"/>
224+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForNestingImageLinkCorrectErrorModal"/>
225225
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingImageLinkModal"/>
226226
<!-- Checks for A tags within the TinyMCE with regex -->
227227
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfImageLinkInWysiwygBoolean"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<argument name="page" value="$$createCMSPageA.identifier$$"/>
173173
</actionGroup>
174174
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnInlineWYSIWYGEditorArea"/>
175-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeNestingWidgetCorrectErrorModal"/>
175+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForNestingWidgetCorrectErrorModal"/>
176176
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingWidgetModal"/>
177177
<!-- Checks for Widget (placeholder) within the WYSIWYG with regex -->
178178
<executeJS function="return (/&lt;span.*(class=)(&quot;|\').*((magento-placeholder).*(magento-widget)|(magento-widget).*(magento-placeholder)).*&lt;\/span&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfWidgetInWysiwygBoolean"/>
@@ -191,7 +191,7 @@
191191
<argument name="wysiwygArea" value=""/>
192192
</actionGroup>
193193
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnInlineWYSIWYGEditorAreaAddLink"/>
194-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeNestingLinkCorrectErrorModal"/>
194+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForNestingLinkCorrectErrorModal"/>
195195
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>
196196
<!-- Checks for A tags within the WYSIWYG with regex -->
197197
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfLinkInWysiwygBoolean"/>
@@ -222,7 +222,7 @@
222222
<waitForElementNotVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInlineWYSIWYGInsertLinkModalGone"/>
223223
<waitForPageLoad stepKey="waitForInlineWYSIWYGStorageRoot"/>
224224
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnInlineWYSIWYGEditorAreaAddImageLink"/>
225-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeNestingImageLinkCorrectErrorModal"/>
225+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForNestingImageLinkCorrectErrorModal"/>
226226
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingImageLinkModal"/>
227227
<!-- Checks for A tags within the TinyMCE with regex -->
228228
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfImageLinkInWysiwygBoolean"/>

0 commit comments

Comments
 (0)