Skip to content

Commit 5f1b676

Browse files
author
Hwashiang Yu
committed
MC-4323: Cannot Add Slider WYSIWYG Image From Gallery or Link to Image in Gallery After Page Has Been Saved
- Added extended test for text and banner
1 parent 6531c51 commit 5f1b676

File tree

5 files changed

+77
-4
lines changed

5 files changed

+77
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<element name="messageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
4040
<element name="noMessageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
4141
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
42+
<element name="messageContentTextAreaImage" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content']//img[contains(@src, {{arg2}})]" parameterized="true"/>
4243
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//div[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
4344
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
4445
<element name="openInNewTab" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
@@ -105,6 +106,7 @@
105106
<element name="showOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
106107
<element name="overlayColorAndTransparency" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
107108
<element name="transparentOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
109+
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
108110
<!-- Advanced Configuration -->
109111
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
110112
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'text-align:'))]" parameterized="true"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<element name="textInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg2}}']" parameterized="true"/>
2828
<element name="emptyTextInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important')]" parameterized="true"/>
2929
<element name="imageSource" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//img[contains(@src,'{{var1}}')]" parameterized="true"/>
30+
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
3031
<!-- Advanced Configuration -->
3132
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
3233
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -68,6 +69,7 @@
6869
<element name="notHidden" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
6970
<element name="baseJs" type="text" selector="document.querySelectorAll('[data-role=\'text\']')[{{arg1}}]" parameterized="true"/>
7071
<element name="textAreaWidget" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}{{arg4}}')]" parameterized="true"/>
72+
<element name="messageContentTextAreaImage" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//img[contains(@src, {{arg2}})]" parameterized="true"/>
7173
<element name="textWidget" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
7274
<element name="textAreaText" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(text(),'{{arg2}}')]" parameterized="true"/>
7375
<element name="textAreaVariable" type="text" selector="(//div[@data-role='text'])[{{arg1}}]//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,4 +2229,38 @@
22292229
<actualResult type="variable">columnOneTextHeight</actualResult>
22302230
</assertGreaterThan>
22312231
</test>
2232+
<test name="BannerInlineWysiwygUploadImage" extends="SlideItemInlineWysiwygUploadImage">
2233+
<annotations>
2234+
<features value="PageBuilder"/>
2235+
<stories value="Banner"/>
2236+
<title value="Can Add Banner WYSIWYG Image From Gallery or Link to Image in Gallery After Page Has Been Saved"/>
2237+
<description value="A user should be able to upload image to inline wysiwyg after a banner has been saved to a page"/>
2238+
<severity value="CRITICAL"/>
2239+
<useCaseId value="MC-4323"/>
2240+
<testCaseId value="MC"/>
2241+
<group value="pagebuilder"/>
2242+
<group value="pagebuilder-banner"/>
2243+
<!--<group value="m"/>-->
2244+
</annotations>
2245+
<!-- Add Banner -->
2246+
<comment userInput="Add Banner" stepKey="commentAddContentType"/>
2247+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2248+
<argument name="group" value="PageBuilderBannerContentType"/>
2249+
</actionGroup>
2250+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeOntoStage">
2251+
<argument name="contentType" value="PageBuilderBannerContentType"/>
2252+
</actionGroup>
2253+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel" after="dragContentTypeOntoStage">
2254+
<argument name="contentType" value="PageBuilderBannerContentType"/>
2255+
</actionGroup>
2256+
<!-- Add Image to Banner -->
2257+
<comment userInput="Add Image to Banner" stepKey="commentAddImageToContentType"/>
2258+
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderBannerContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
2259+
<!-- Validated Backend -->
2260+
<seeElement selector="{{BannerOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
2261+
<!-- Validated Backend After Save -->
2262+
<seeElement selector="{{BannerOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditorAfterSave"/>
2263+
<!-- Validate Storefront -->
2264+
<seeElement selector="{{BannerOnFrontend.messageContentTextAreaImage('1', PageBuilderBackgroundImage_JPG.value)}}" stepKey="validateImageFrontEnd"/>
2265+
</test>
22322266
</tests>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,11 +1741,11 @@
17411741
<actionGroup ref="logout" stepKey="logout"/>
17421742
</after>
17431743
<!-- Add Slider -->
1744-
<comment userInput="Add Slider" stepKey="commentAddSlider"/>
1744+
<comment userInput="Add Slider" stepKey="commentAddContentType"/>
17451745
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
17461746
<argument name="group" value="PageBuilderSliderContentType"/>
17471747
</actionGroup>
1748-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderOntoStage">
1748+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeOntoStage">
17491749
<argument name="contentType" value="PageBuilderSliderContentType"/>
17501750
</actionGroup>
17511751
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -1754,7 +1754,7 @@
17541754
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="initialSaveAndContinueEditCmsPage"/>
17551755
<actionGroup ref="switchToPageBuilderStage" stepKey="initialSwitchToPageBuilderStage"/>
17561756
<!-- Add Image to Slide -->
1757-
<comment userInput="Add Image to Slide" stepKey="commentAddImageToSlide"/>
1757+
<comment userInput="Add Image to Slide" stepKey="commentAddImageToContentType"/>
17581758
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderSlideContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
17591759
<waitForPageLoad stepKey="waitforInlineWYSIWYGEditor"/>
17601760
<click selector="{{WYSIWYGInsertImageModal.imageSelector}}" stepKey="clickWYSIWYGImageSelector"/>
@@ -1775,7 +1775,7 @@
17751775
<waitForPageLoad stepKey="waitForPageLoad"/>
17761776
<!-- Validated Backend -->
17771777
<comment userInput="Validated Backend" stepKey="commentValidateBackend"/>
1778-
<seeElement selector="{{SlideOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="alidateImageInEditor"/>
1778+
<seeElement selector="{{SlideOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
17791779
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
17801780
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
17811781
<!-- Validated Backend After Save -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,4 +2397,39 @@
23972397
<actualResult type="variable">columnOneTextHeight</actualResult>
23982398
</assertGreaterThan>
23992399
</test>
2400+
2401+
<test name="TextInlineWysiwygUploadImage" extends="SlideItemInlineWysiwygUploadImage">
2402+
<annotations>
2403+
<features value="PageBuilder"/>
2404+
<stories value="Banner"/>
2405+
<title value="Can Add Text WYSIWYG Image From Gallery or Link to Image in Gallery After Page Has Been Saved"/>
2406+
<description value="A user should be able to upload image to inline wysiwyg after a banner has been saved to a page"/>
2407+
<severity value="CRITICAL"/>
2408+
<useCaseId value="MC-4323"/>
2409+
<testCaseId value="MC"/>
2410+
<group value="pagebuilder"/>
2411+
<group value="pagebuilder-text"/>
2412+
</annotations>
2413+
<!-- Add Text -->
2414+
<comment userInput="Add Text" stepKey="commentAddContentType"/>
2415+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2416+
<argument name="group" value="PageBuilderTextContentType"/>
2417+
</actionGroup>
2418+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeOntoStage">
2419+
<argument name="contentType" value="PageBuilderTextContentType"/>
2420+
</actionGroup>
2421+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor" after="dragContentTypeOntoStage"/>
2422+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel" after="unFocusEditor">
2423+
<argument name="contentType" value="PageBuilderTextContentType"/>
2424+
</actionGroup>
2425+
<!-- Add Image to Text -->
2426+
<comment userInput="Add Image to Text" stepKey="commentAddImageToContentType"/>
2427+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
2428+
<!-- Validated Backend -->
2429+
<seeElement selector="{{TextOnStage.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
2430+
<!-- Validated Backend After Save -->
2431+
<seeElement selector="{{TextOnStage.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditorAfterSave"/>
2432+
<!-- Validate Storefront -->
2433+
<seeElement selector="{{TextOnStorefront.messageContentTextAreaImage('1', PageBuilderBackgroundImage_JPG.value)}}" stepKey="validateImageFrontEnd"/>
2434+
</test>
24002435
</tests>

0 commit comments

Comments
 (0)