Skip to content

Commit 7cf8af0

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-4323-cannot-add-slider-wysiwyg-image' into owls-ce
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest.xml
2 parents a1cd9af + 205f325 commit 7cf8af0

7 files changed

+156
-0
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
@@ -34,6 +34,7 @@
3434
<element name="messageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
3535
<element name="noMessageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
3636
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
37+
<element name="messageContentTextAreaImage" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content']//img[contains(@src, {{arg2}})]" parameterized="true"/>
3738
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
3839
<element name="messageContentText" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
3940
<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"/>
@@ -100,6 +101,7 @@
100101
<element name="showOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
101102
<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"/>
102103
<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"/>
104+
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
103105
<!-- Advanced Configuration -->
104106
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
105107
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
<element name="messageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
9191
<element name="noMessageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][not(*)]" parameterized="true"/>
9292
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
93+
<element name="messageContentTextAreaImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content']//img[contains(@src, {{arg2}})]" parameterized="true"/>
9394
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
9495
<element name="messageContentText" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
9596
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
@@ -159,6 +160,10 @@
159160
<element name="showOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
160161
<element name="overlayColorAndTransparency" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
161162
<element name="transparentOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true"/>
163+
<element name="overlayColorAndTransparency" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-collage-overlay')][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
164+
<element name="transparentOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-collage-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true"/>
165+
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
166+
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
162167
<!-- Advanced Configuration -->
163168
<element name="posterAlignment" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
164169
<element name="posterNoAlignment" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@class='pagebuilder-slide-wrapper'][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/Section/PageBuilderWYSIWYGSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,8 @@
3838
<element name="textColor" type="button" selector=".mce-tinymce-inline div[aria-label='Text color']"/>
3939
<element name="backgroundColor" type="button" selector=".mce-tinymce-inline div[aria-label='Background color']"/>
4040
<element name="formatSelector" type="button" selector="//div[contains(@class, 'mce-tinymce')]//span[text()='Formats']"/>
41+
<element name="imageSelector" type="button" selector=".mce-tinymce-inline div[aria-label='Insert/edit image']"/>
42+
<element name="imageSelectorBrowse" type="button" selector="div[aria-label='Insert/edit image'] i.mce-i-browse"/>
43+
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
4144
</section>
4245
</sections>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,4 +2269,35 @@
22692269
<seeElement selector="{{BannerOnFrontend.messageContentTextAreaTextWidget('1', _ENV.MAGENTO_BASE_URL, $$createCMSPageB.identifier$$)}}" stepKey="seeWidgetStorefront"/>
22702270
<click selector="{{BannerOnFrontend.messageContentTextAreaTextWidget('1', _ENV.MAGENTO_BASE_URL, $$createCMSPageB.identifier$$)}}" stepKey="clickWidgetStorefront"/>
22712271
</test>
2272+
<test name="BannerInlineWysiwygUploadImage" extends="SlideItemInlineWysiwygUploadImage">
2273+
<annotations>
2274+
<features value="PageBuilder"/>
2275+
<stories value="Banner"/>
2276+
<title value="Can Add Banner WYSIWYG Image From Gallery or Link to Image in Gallery After Page Has Been Saved"/>
2277+
<description value="A user should be able to upload image to inline wysiwyg after a banner has been saved to a page"/>
2278+
<severity value="CRITICAL"/>
2279+
<useCaseId value="MC-4323"/>
2280+
<testCaseId value="MC-5019"/>
2281+
<group value="pagebuilder"/>
2282+
<group value="pagebuilder-banner"/>
2283+
</annotations>
2284+
<!-- Add Banner -->
2285+
<comment userInput="Add Banner" stepKey="commentAddContentType"/>
2286+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2287+
<argument name="group" value="PageBuilderBannerContentType"/>
2288+
</actionGroup>
2289+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeOntoStage">
2290+
<argument name="contentType" value="PageBuilderBannerContentType"/>
2291+
</actionGroup>
2292+
<comment userInput="Removed closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
2293+
<!-- Add Image to Banner -->
2294+
<comment userInput="Add Image to Banner" stepKey="commentAddImageToContentType"/>
2295+
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderBannerContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
2296+
<!-- Validate Image Editor On Backend -->
2297+
<seeElement selector="{{BannerOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
2298+
<!-- Validate Image Editor On Backend After Save -->
2299+
<seeElement selector="{{BannerOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditorAfterSave"/>
2300+
<!-- Validate Image Editor On Storefront -->
2301+
<seeElement selector="{{BannerOnFrontend.messageContentTextAreaImage('1', PageBuilderBackgroundImage_JPG.value)}}" stepKey="validateImageFrontEnd"/>
2302+
</test>
22722303
</tests>

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

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,4 +1751,85 @@
17511751
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterHideShow"/>
17521752
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlideBackgroundColorAfterHideShow"/>
17531753
</test>
1754+
<test name="SlideItemInlineWysiwygUploadImage">
1755+
<annotations>
1756+
<features value="PageBuilder"/>
1757+
<stories value="Slider"/>
1758+
<title value="Can Add Slider WYSIWYG Image From Gallery or Link to Image in Gallery After Page Has Been Saved"/>
1759+
<description value="A user should be able to upload image to inline wysiwyg after a slider has been saved to a page"/>
1760+
<severity value="CRITICAL"/>
1761+
<useCaseId value="MC-4323"/>
1762+
<testCaseId value="MC-5014"/>
1763+
<group value="pagebuilder"/>
1764+
<group value="pagebuilder-slide"/>
1765+
<group value="pagebuilder-slideItemCommon"/>
1766+
</annotations>
1767+
<before>
1768+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1769+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
1770+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
1771+
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
1772+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage1">
1773+
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
1774+
</actionGroup>
1775+
</before>
1776+
<after>
1777+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
1778+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1779+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
1780+
</actionGroup>
1781+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1782+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1783+
</actionGroup>
1784+
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
1785+
<actionGroup ref="logout" stepKey="logout"/>
1786+
</after>
1787+
<comment userInput="Add Slider" stepKey="commentAddContentType"/>
1788+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1789+
<argument name="group" value="PageBuilderSliderContentType"/>
1790+
</actionGroup>
1791+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeOntoStage">
1792+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1793+
</actionGroup>
1794+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
1795+
<!-- Initial Save -->
1796+
<comment userInput="Initial Save" stepKey="commentInitialSave"/>
1797+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="initialSaveAndContinueEditCmsPage"/>
1798+
<actionGroup ref="switchToPageBuilderStage" stepKey="initialSwitchToPageBuilderStage"/>
1799+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
1800+
<waitForPageLoad stepKey="waitForPageLoad"/>
1801+
<!-- Add Image to Slide -->
1802+
<comment userInput="Add Image to Slide" stepKey="commentAddImageToContentType"/>
1803+
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderSlideContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
1804+
<waitForPageLoad stepKey="waitForInlineWYSIWYGEditor"/>
1805+
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelector}}" stepKey="clickWYSIWYGImageSelector"/>
1806+
<waitForPageLoad stepKey="waitForImageSelectorModal"/>
1807+
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
1808+
<waitForPageLoad stepKey="waitForImageSelectorBrowseModal"/>
1809+
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
1810+
<waitForPageLoad stepKey="waitForStorageRoot"/>
1811+
<actionGroup ref="CreateImageFolder" stepKey="createImageFolder">
1812+
<argument name="ImageFolder" value="ImageFolder"/>
1813+
</actionGroup>
1814+
<actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
1815+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1816+
</actionGroup>
1817+
<actionGroup ref="saveImage" stepKey="saveImage"/>
1818+
<actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup"/>
1819+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlide"/>
1820+
<waitForPageLoad stepKey="waitForSlideToUnFocus"/>
1821+
<!-- Validate Image Editor On Backend -->
1822+
<comment userInput="Validate Image Editor On Backend" stepKey="commentValidateBackend"/>
1823+
<seeElement selector="{{SlideOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
1824+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1825+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1826+
<!-- Validate Image Editor On Backend After Save Page -->
1827+
<comment userInput="Validate Image Editor On Backend After Save" stepKey="commentValidateBackendAfterSave"/>
1828+
<seeElement selector="{{SlideOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditorAfterSave"/>
1829+
<!-- Validate Image Editor On Storefront -->
1830+
<comment userInput="Validate Image Editor On Storefront" stepKey="commentValidateStorefront"/>
1831+
<amOnPage url="$$createPreReqCMSPage.identifier$$" stepKey="amOnCmsStorefront"/>
1832+
<waitForPageLoad stepKey="waitForPageLoad4"/>
1833+
<seeElement selector="{{SlideOnFrontend.messageContentTextAreaImage('1', PageBuilderImageProperty_StageJPG.value)}}" stepKey="validateImageFrontEnd"/>
1834+
</test>
17541835
</tests>

0 commit comments

Comments
 (0)