Skip to content

Commit f9c9dbc

Browse files
author
Hwashiang Yu
committed
MC-5386: Anchors Under Each Div if TinyMCE link Is Added to Banner/Slide (Add Notification for When Link Attribute Is Entered)
- Merged newly created action group with existing action group
1 parent 88662ab commit f9c9dbc

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,11 @@
140140
<argument name="url" type="string"/>
141141
<argument name="textToDisplay" type="string"/>
142142
<argument name="title" type="string" defaultValue=""/>
143+
<argument name="wysiwygArea" defaultValue="{{WYSIWYGOnPageBuilderInline.notCss}}" type="string"/>
143144
</arguments>
144145
<comment userInput="insertLinkInWYSIWYG" stepKey="comment"/>
145-
<waitForElementVisible selector="{{WYSIWYGOnPageBuilderInline.notCss}} {{section.InsertLink}}" stepKey="waitForInsertLinkButton"/>
146-
<click selector="{{WYSIWYGOnPageBuilderInline.notCss}} {{section.InsertLink}}" stepKey="clickInsertLinkButton"/>
146+
<waitForElementVisible selector="{{wysiwygArea}} {{section.InsertLink}}" stepKey="waitForInsertLinkButton"/>
147+
<click selector="{{wysiwygArea}} {{section.InsertLink}}" stepKey="clickInsertLinkButton"/>
147148
<waitForPageLoad stepKey="waitForPageLoad"/>
148149
<waitForElementVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInsertLinkModal"/>
149150
<fillField selector="{{WYSIWYGInsertLinkModal.urlInput}}" userInput="{{url}}" stepKey="insertUrl"/>
@@ -153,10 +154,6 @@
153154
<waitForPageLoad stepKey="waitForPageLoad2"/>
154155
<waitForElementNotVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInsertLinkModalGone"/>
155156
</actionGroup>
156-
<actionGroup name="addPageLinkToTinyMCEInline" extends="insertLinkInWYSIWYG">
157-
<waitForElementVisible selector="{{TinyMCESection.InsertLink}}" stepKey="waitForInsertLinkButton"/>
158-
<click selector="{{TinyMCESection.InsertLink}}" stepKey="clickInsertLinkButton"/>
159-
</actionGroup>
160157
<actionGroup name="assertTextareaContainsValue">
161158
<arguments>
162159
<argument name="selector" type="string"/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2289,9 +2289,10 @@
22892289
<comment userInput="Check inline editor will validate for not allowing TinyMCE Link and Link URL at the same time" stepKey="commentCheckInlineEditorPreventAddingBothUrls"/>
22902290
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderBannerContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
22912291
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderBannerContentType.role, '1')}}" stepKey="waitForEditorPanel"/>
2292-
<actionGroup ref="addPageLinkToTinyMCEInline" stepKey="insertLinkInStageInlineEditor">
2292+
<actionGroup ref="insertLinkInWYSIWYG" stepKey="insertLinkInStageInlineEditor">
22932293
<argument name="url" value="{{ExternalLink.googleUrl}}"/>
22942294
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
2295+
<argument name="wysiwygArea" value=""/>
22952296
</actionGroup>
22962297
<seeElement selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeCorrectErrorModal"/>
22972298
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1924,9 +1924,10 @@
19241924
<comment userInput="Validate Inline Editor" stepKey="commentValidateInlineEditor"/>
19251925
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderSlideContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
19261926
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderSlideContentType.role, '1')}}" stepKey="waitForEditorPanel"/>
1927-
<actionGroup ref="addPageLinkToTinyMCEInline" stepKey="insertLinkInStageInlineEditor">
1927+
<actionGroup ref="insertLinkInWYSIWYG" stepKey="insertLinkInStageInlineEditor">
19281928
<argument name="url" value="{{ExternalLink.googleUrl}}"/>
19291929
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
1930+
<argument name="wysiwygArea" value=""/>
19301931
</actionGroup>
19311932
<seeElement selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeCorrectErrorModal"/>
19321933
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>

0 commit comments

Comments
 (0)