Skip to content

Commit 2d220af

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
- Updated test action groups - Resolved test flakiness
1 parent 082ba6d commit 2d220af

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,23 @@
161161
<actualResult type="variable">textareaValue</actualResult>
162162
</assertEquals>
163163
</actionGroup>
164+
<actionGroup name="openMediaGalleryFromTinyMCEInlineEditor">
165+
<arguments>
166+
<argument name="contentType"/>
167+
<argument name="index" type="string" defaultValue="1"/>
168+
</arguments>
169+
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
170+
<waitForPageLoad stepKey="waitForInlineWYSIWYGEditor"/>
171+
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelector}}" stepKey="clickWYSIWYGImageSelector"/>
172+
<waitForPageLoad stepKey="waitForImageSelectorModal"/>
173+
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
174+
<waitForPageLoad stepKey="waitForImageSelectorBrowseModal"/>
175+
</actionGroup>
176+
<actionGroup name="openMediaGalleryFromCustomTinyMCEInlineEditor">
177+
<waitForPageLoad stepKey="waitForInlineWYSIWYGEditor"/>
178+
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelector}}" stepKey="clickWYSIWYGImageSelector"/>
179+
<waitForPageLoad stepKey="waitForImageSelectorModal"/>
180+
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
181+
<waitForPageLoad stepKey="waitForImageSelectorBrowseModal"/>
182+
</actionGroup>
164183
</actionGroups>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
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-
</section>
42-
<section name="WYSIWYGInsertImageModal">
4341
<element name="imageSelector" type="button" selector=".mce-tinymce-inline div[aria-label='Insert/edit image']"/>
4442
<element name="imageSelectorBrowse" type="button" selector="div[aria-label='Insert/edit image'] i.mce-i-browse"/>
4543
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,12 +2249,12 @@
22492249
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeOntoStage">
22502250
<argument name="contentType" value="PageBuilderBannerContentType"/>
22512251
</actionGroup>
2252-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel" after="dragContentTypeOntoStage">
2253-
<argument name="contentType" value="PageBuilderBannerContentType"/>
2254-
</actionGroup>
2252+
<comment userInput="Removed closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
22552253
<!-- Add Image to Banner -->
22562254
<comment userInput="Add Image to Banner" stepKey="commentAddImageToContentType"/>
2257-
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderBannerContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
2255+
<actionGroup ref="openMediaGalleryFromTinyMCEInlineEditor" stepKey="openMediaGalleryFromTinyMCEInlineEditor">
2256+
<argument name="contentType" value="PageBuilderBannerContentType"/>
2257+
</actionGroup>
22582258
<!-- Validated Backend -->
22592259
<seeElement selector="{{BannerOnBackend.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
22602260
<!-- Validated Backend After Save -->

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,24 +1753,20 @@
17531753
<comment userInput="Initial Save" stepKey="commentInitialSave"/>
17541754
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="initialSaveAndContinueEditCmsPage"/>
17551755
<actionGroup ref="switchToPageBuilderStage" stepKey="initialSwitchToPageBuilderStage"/>
1756+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
17561757
<!-- Add Image to Slide -->
17571758
<comment userInput="Add Image to Slide" stepKey="commentAddImageToContentType"/>
1758-
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderSlideContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
1759-
<waitForPageLoad stepKey="waitforInlineWYSIWYGEditor"/>
1760-
<click selector="{{WYSIWYGInsertImageModal.imageSelector}}" stepKey="clickWYSIWYGImageSelector"/>
1761-
<waitForPageLoad stepKey="waitforImageSelectorModal"/>
1762-
<click selector="{{WYSIWYGInsertImageModal.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
1763-
<waitForPageLoad stepKey="waitforImageSelectorBrowseModal"/>
1759+
<actionGroup ref="openMediaGalleryFromTinyMCEInlineEditor" stepKey="openMediaGalleryFromTinyMCEInlineEditor">
1760+
<argument name="contentType" value="PageBuilderSlideContentType"/>
1761+
</actionGroup>
17641762
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToWYSIWYGFolderActionGroup">
17651763
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
17661764
</actionGroup>
1767-
<waitForElementVisible selector="{{MediaGallerySection.image(PageBuilderBackgroundImage_JPG.value)}}" stepKey="wait" />
1765+
<waitForElementVisible selector="{{MediaGallerySection.image(PageBuilderBackgroundImage_JPG.value)}}" stepKey="waitForImageVisible" />
17681766
<click selector="{{MediaGallerySection.image(PageBuilderBackgroundImage_JPG.value)}}" stepKey="clickImage" />
17691767
<waitForPageLoad stepKey="waitForAddSelectButton"/>
1770-
<click selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="clickAddSelectedButton" />
1771-
<waitForPageLoad stepKey="waitForImageSelector"/>
1772-
<click selector="{{WYSIWYGInsertImageModal.imageSelectorOk}}" stepKey="clickWYSIWYGImageSelectorOkButton"/>
1773-
<waitForPageLoad stepKey="waitForStageReload"/>
1768+
<actionGroup ref="saveImage" stepKey="saveImage"/>
1769+
<actionGroup ref="fillOutUploadImagePopup" stepKey="fillOutUploadImagePopup"/>
17741770
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlide"/>
17751771
<waitForPageLoad stepKey="waitForPageLoad"/>
17761772
<!-- Validated Backend -->

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2397,7 +2397,6 @@
23972397
<actualResult type="variable">columnOneTextHeight</actualResult>
23982398
</assertGreaterThan>
23992399
</test>
2400-
24012400
<test name="TextInlineWysiwygUploadImage" extends="SlideItemInlineWysiwygUploadImage">
24022401
<annotations>
24032402
<features value="PageBuilder"/>
@@ -2418,13 +2417,12 @@
24182417
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeOntoStage">
24192418
<argument name="contentType" value="PageBuilderTextContentType"/>
24202419
</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>
2420+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor2" after="dragContentTypeOntoStage"/>
2421+
<comment userInput="Removed closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
24252422
<!-- Add Image to Text -->
24262423
<comment userInput="Add Image to Text" stepKey="commentAddImageToContentType"/>
2427-
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
2424+
<click selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea" after="commentAddImageToContentType"/>
2425+
<actionGroup ref="openMediaGalleryFromCustomTinyMCEInlineEditor" stepKey="openMediaGalleryFromTinyMCEInlineEditor"/>
24282426
<!-- Validated Backend -->
24292427
<seeElement selector="{{TextOnStage.inlineWYSIWYGEditorWithTag('1', 'img')}}" stepKey="validateImageInEditor"/>
24302428
<!-- Validated Backend After Save -->

0 commit comments

Comments
 (0)