Skip to content

Commit e8b3678

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

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
7474
<argument name="wysiwygArea" value=""/>
7575
</actionGroup>
76-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeCorrectErrorModal"/>
76+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnEditorArea"/>
77+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForCorrectErrorModal"/>
7778
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>
7879
<!-- Checks for a tags within the tinyMCE with regex -->
7980
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfAnchorInWysiwygBoolean"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Slider"/>
14-
<title value="SlideItem inline WYSIWYG editor will notify user of not adding "/>
14+
<title value="SlideItem inline WYSIWYG editor will notify user of not adding"/>
1515
<description value="Slide Item edit form and inline editor validate Slide Item TinyMCE Link and Link URL cannot be added at the same time."/>
1616
<severity value="MAJOR"/>
1717
<useCaseId value="MC-5386"/>
@@ -82,7 +82,8 @@
8282
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
8383
<argument name="wysiwygArea" value=""/>
8484
</actionGroup>
85-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeCorrectErrorModal"/>
85+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusOnEditorArea"/>
86+
<waitForElementVisible selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="waitForCorrectErrorModal"/>
8687
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>
8788
<!-- Checks for a tags within the tinyMCE with regex -->
8889
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfAnchorInWysiwygBoolean"/>

0 commit comments

Comments
 (0)