Skip to content

Commit ceaee98

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)
- Added banner regex comment - Reduced edit form section error message selector - Reduced banner and slider data - Resolved minor typos
1 parent 07b804d commit ceaee98

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@
7373
<data key="section">contents</data>
7474
<data key="fieldName">message</data>
7575
<data key="errorMessage">Adding link in both content and outer element is not allowed.</data>
76-
</entity>
77-
<entity name="PageBuilderStageBannerMessageInvalidProperty" type="pagebuilder_banner_message_property">
78-
<data key="errorMessage">Adding link in content and outer element is not allowed. Remove the link from the element before adding links to the content.</data>
76+
<data key="stageErrorMessage">Adding link in content and outer element is not allowed. Remove the link from the element before adding links to the content.</data>
7977
</entity>
8078
<!-- Background Color -->
8179
<entity name="PageBuilderBannerBackgroundColor_Empty" type="pagebuilder_banner_background_color_property">

app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,6 @@
246246
<data key="section">general</data>
247247
<data key="fieldName">content</data>
248248
<data key="errorMessage">Adding link in both content and outer element is not allowed.</data>
249-
</entity>
250-
<entity name="PageBuilderStageSlideItemMessageInvalidProperty" type="pagebuilder_slide_item_message__property">
251-
<data key="errorMessage">Adding link in content and outer element is not allowed. Remove the link from the element before adding links to the content.</data>
249+
<data key="stageErrorMessage">Adding link in content and outer element is not allowed. Remove the link from the element before adding links to the content.</data>
252250
</entity>
253251
</entities>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<element name="panelFieldNoPlaceholderText" type="input" selector='//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}" and not(@placeholder)]' parameterized="true"/>
3232
<element name="panelFieldAfterLabelText" type="text" selector="//div[@data-index='{{arg1}}']//span[@data-bind='text: addafter' and .='{{arg2}}']" parameterized="true"/>
3333
<element name="panelFieldNoAfterLabelText" type="text" selector="//div[@data-index='{{arg1}}']//span[@data-bind='text: addafter']" parameterized="true"/>
34-
<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,'')]//input[@name='{{arg2}}']|//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//textarea[@name='{{arg2}}']|//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//div[contains(@class,'mce-tinymce')]" parameterized="true"/>
35-
<element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//input[@name='{{arg2}}']//..//../label[.='{{arg3}}']|//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//textarea[@name='{{arg2}}']//..//..//../label[.='{{arg3}}']|//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//div[contains(@class,'mce-tinymce')]//..//..//../label[.='{{arg3}}']|//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//input[@name='{{arg2}}']//..//..//../label[.='{{arg3}}']" parameterized="true"/>
34+
<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"/>
35+
<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"/>
3636
<element name="panelMultiSelectFieldControl" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] [data-role='advanced-select']" parameterized="true"/>
3737
<element name="panelMultiSelectFieldControlInput" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] .admin__action-multiselect-search" parameterized="true"/>
3838
<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/Test/AdminPageBuilderBannerCommonTest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,7 +2232,7 @@
22322232
<annotations>
22332233
<features value="PageBuilder"/>
22342234
<stories value="Banner"/>
2235-
<title value="Banner inline WYSIWYG editor will notify user of could not add TinyMCE Link and Link URL at the same time"/>
2235+
<title value="Banner inline WYSIWYG editor will notify user that they cannot add TinyMCE Link and Link URL at the same time"/>
22362236
<description value="Banner edit form and inline editor validate banner TinyMCE Link and Link URL could not be added at the same time."/>
22372237
<severity value="MAJOR"/>
22382238
<useCaseId value="MC-5386"/>
@@ -2293,8 +2293,9 @@
22932293
<argument name="url" value="{{ExternalLink.googleUrl}}"/>
22942294
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
22952295
</actionGroup>
2296-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderStageBannerMessageInvalidProperty.errorMessage)}}" stepKey="seeCorrectErrorModal"/>
2296+
<seeElement selector="{{PageBuilderStage.modal(PageBuilderBannerMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeCorrectErrorModal"/>
22972297
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>
2298+
<!-- Checks for a tags within the tinyMCE with regex -->
22982299
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfAnchorInWysiwygBoolean"/>
22992300
<assertFalse stepKey="assertMessageHasNoAnchorTags">
23002301
<actualResult type="variable">grabIfAnchorInWysiwygBoolean</actualResult>
@@ -2305,6 +2306,7 @@
23052306
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageAfterInlineValidation">
23062307
<argument name="contentType" value="PageBuilderBannerContentType"/>
23072308
</actionGroup>
2309+
<!-- Checks for a tags within the tinyMCE with regex -->
23082310
<executeJS function="return (/&lt;a[\s]+([^&gt;]+)&gt;|&lt;a&gt;|&lt;\/a&gt;/igm).test(tinymce.activeEditor.getContent());" stepKey="grabIfAnchorInSlideOutWysiwygBoolean"/>
23092311
<assertFalse stepKey="assertMessageHasNoAnchorTags2">
23102312
<actualResult type="variable">grabIfAnchorInSlideOutWysiwygBoolean</actualResult>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,7 +1859,7 @@
18591859
<features value="PageBuilder"/>
18601860
<stories value="Slider"/>
18611861
<title value="SlideItem inline WYSIWYG editor will notify user of not adding "/>
1862-
<description value="Slide Item edit form and inline editor validate Slide Item TinyMCE Link and Link URL could not be added at the same time."/>
1862+
<description value="Slide Item edit form and inline editor validate Slide Item TinyMCE Link and Link URL cannot be added at the same time."/>
18631863
<severity value="MAJOR"/>
18641864
<useCaseId value="MC-5386"/>
18651865
<testCaseId value="MC-6053"/>
@@ -1928,7 +1928,7 @@
19281928
<argument name="url" value="{{ExternalLink.googleUrl}}"/>
19291929
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
19301930
</actionGroup>
1931-
<seeElement selector="{{PageBuilderStage.modal(PageBuilderStageSlideItemMessageInvalidProperty.errorMessage)}}" stepKey="seeCorrectErrorModal"/>
1931+
<seeElement selector="{{PageBuilderStage.modal(PageBuilderSlideItemMessageInvalidProperty.stageErrorMessage)}}" stepKey="seeCorrectErrorModal"/>
19321932
<actionGroup ref="confirmRemovalModal" stepKey="confirmNestingLinkModal"/>
19331933
<!-- Checks for a tags within the tinyMCE with regex -->
19341934
<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)