Skip to content

Commit ce6181d

Browse files
nathanjosiahnathanjosiah
committed
Merge branch 'MC-2294' of github.com:magento-trigger/magento2-page-builder into MC-2294
2 parents 2490393 + ff9da8a commit ce6181d

File tree

6 files changed

+198
-39
lines changed

6 files changed

+198
-39
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,12 @@
2929
<fillField selector="{{AdminBannerBasicActionSection.Name}}" userInput="{{Banner.Name}}" stepKey="fillBannerName"/>
3030
<conditionalClick selector="{{AdminBannerBasicActionSection.ContentTab}}" dependentSelector="{{BannerContentSection.checkIfContentTabOpen}}" stepKey="clickIfContentTabCloses" visible="true"/>
3131
</actionGroup>
32+
<actionGroup name="addImageToBannerStage">
33+
<arguments>
34+
<argument name="property"/>
35+
</arguments>
36+
<comment userInput="Attach image A to Banner stage" stepKey="commentAttach"/>
37+
<attachFile userInput="{{property.value}}" selector="{{PageBuilderStage.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
38+
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
39+
</actionGroup>
3240
</actionGroups>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,17 @@
3737
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(property.value)}}" stepKey="seeImageNameOnPreview"/>
3838
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="seeMainImageSource"/>
3939
</actionGroup>
40+
<actionGroup name="goToMediaStorageFromStage">
41+
<arguments>
42+
<argument name="contentType"/>
43+
<argument name="section"/>
44+
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
45+
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
46+
</arguments>
47+
<comment userInput="Hover uploaded image to check Upload New Image button and Select From Gallery button" stepKey="commentHover"/>
48+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverBannerContentTypeStage"/>
49+
<waitForElementVisible selector="{{section.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />
50+
<click selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn1" />
51+
<waitForPageLoad stepKey="waitForPageLoad"/>
52+
</actionGroup>
4053
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<element name="backgroundMobileImage" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[contains(@class,'pagebuilder-banner-wrapper') and contains(@class,'pagebuilder-mobile-only')][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
7171
</section>
7272
<section name="BannerOnBackend">
73+
<element name="attachImageBtn" type="button" selector="//div[@class='pagebuilder-image-uploader-container']//input[@name='background_image']" />
7374
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
7475
<element name="default" type="button" selector="(//div[contains(@class, 'pagebuilder-banner')])[{{arg1}}][contains(@style, 'border-style: {{arg2}};') and contains(@style, 'border-radius: {{arg3}}px;') and contains(@style, 'margin: {{arg4}}px;')]//div[contains(@class, 'pagebuilder-banner-wrapper') and contains(@style, 'background-size: {{arg6}};') and contains(@style, 'background-repeat: {{arg7}};') and contains(@style, 'background-attachment: {{arg8}};')]//div[contains(@class, 'pagebuilder-poster-overlay')][contains(@style,'padding: {{arg10}}px;')]" parameterized="true"/>
7576
<element name="backgroundImageSource" type="button" selector="//div[contains(@style, '{{arg1}}')]" parameterized="true"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<element name="invalidUploadTitle" type="text" selector="//aside[contains(@class,'modal-popup')]//header/h1[contains(.,'Attention')]"/>
4646
<element name="invalidUploadMessage" type="text" selector="//aside[contains(@class,'modal-popup')]//div[@class='modal-content']//div[.=&quot;{{arg1}}&quot;]" parameterized="true"/>
4747
<element name="invalidUploadOkBtn" type="text" selector="//aside[contains(@class,'modal-popup')]//footer//button//span[.='OK']"/>
48+
<element name="selectFromGalleryBtnInitial" type="text" selector="//div[@data-index='{{arg1}}']//input[@name='{{arg2}}']//following-sibling::label[text()='Select from Gallery']" parameterized="true"/>
4849
</section>
4950
<section name="AdvancedForm">
5051
<element name="sectionName" type="button" selector="//div[@data-index='advanced']"/>

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

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,4 +1429,127 @@
14291429
<argument name="containerTargetIndex" value="2"/>
14301430
</actionGroup>
14311431
</test>
1432+
<test name="BannerContentBlockDeleteImage">
1433+
<annotations>
1434+
<features value="PageBuilder"/>
1435+
<stories value="Banner"/>
1436+
<title value="Image from Banner Content Block get wiped out after delete image from Media Storage"/>
1437+
<description value="Image from Banner Content Block get wiped out after delete image from Media Storage"/>
1438+
<severity value="CRITICAL"/>
1439+
<useCaseId value="MC-2294"/>
1440+
<testCaseId value=""/>
1441+
<group value="pagebuilder"/>
1442+
<group value="pagebuilder-image"/>
1443+
<group value="pagebuilder-banner"/>
1444+
</annotations>
1445+
<before>
1446+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1447+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1448+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1449+
</before>
1450+
<after>
1451+
<actionGroup ref="logout" stepKey="logout"/>
1452+
</after>
1453+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1454+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1455+
</actionGroup>
1456+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1457+
<argument name="group" value="PageBuilderBannerContentType"/>
1458+
</actionGroup>
1459+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1460+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1461+
</actionGroup>
1462+
<!-- Attach image A to PageBuilder stage -->
1463+
<actionGroup ref="addImageToBannerStage" stepKey="addImageToStage">
1464+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
1465+
</actionGroup>
1466+
<!-- Go to Media Storage from stage-->
1467+
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage"/>
1468+
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
1469+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1470+
<argument name="section" value="ImageOnStage"/>
1471+
</actionGroup>
1472+
<!--Delete image A-->
1473+
<comment stepKey="deleteImageA" userInput="Delete image A"/>
1474+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
1475+
<argument name="Image" value="PageBuilderBackgroundImage_JPGv"/>
1476+
</actionGroup>
1477+
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
1478+
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage"/>
1479+
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage1"/>
1480+
1481+
1482+
1483+
1484+
<waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
1485+
<actionGroup ref="CreateImageFolder" stepKey="createImageFolder1">
1486+
<argument name="ImageFolder" value="ImageFolder"/>
1487+
</actionGroup>
1488+
<actionGroup ref="attachImage" stepKey="attachImageFile2">
1489+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
1490+
</actionGroup>
1491+
<actionGroup ref="saveImage" stepKey="saveImage2"/>
1492+
<waitForElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="seeImageInDOM"/>
1493+
1494+
1495+
1496+
1497+
1498+
1499+
<!-- Attach image C to Image slideout form -->
1500+
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
1501+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
1502+
<argument name="contentType" value="PageBuilderImageContentType"/>
1503+
</actionGroup>
1504+
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageFile1">
1505+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1506+
</actionGroup>
1507+
<actionGroup ref="verifyImageOnSlideout" stepKey="verifyImageOnSlideout1">
1508+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1509+
</actionGroup>
1510+
<!--Delete image C-->
1511+
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
1512+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1513+
</actionGroup>
1514+
<comment stepKey="deleteImageC" userInput="Delete image C"/>
1515+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
1516+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1517+
</actionGroup>
1518+
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>
1519+
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>-->
1520+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeMainImageSource"/>
1521+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
1522+
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage2"/>
1523+
1524+
<!-- Attach image B to Image slideout form from Media Storage -->
1525+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
1526+
<argument name="contentType" value="PageBuilderImageContentType"/>
1527+
</actionGroup>
1528+
<click selector="{{EditPanelForm.selectFromGalleryBtnInitial('general','image')}}" stepKey="clickSelectfromGallery"/>
1529+
<waitForPageLoad stepKey="waitForPageLoad"/>
1530+
<actionGroup ref="CreateImageFolder" stepKey="createImageFolder">
1531+
<argument name="ImageFolder" value="ImageFolder"/>
1532+
</actionGroup>
1533+
<actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
1534+
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
1535+
</actionGroup>
1536+
<actionGroup ref="saveImage" stepKey="saveImage"/>
1537+
<actionGroup ref="verifyImageOnSlideout" stepKey="verifyImageOnSlideout2">
1538+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1539+
</actionGroup>
1540+
<!--Delete image B-->
1541+
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut2">
1542+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1543+
</actionGroup>
1544+
<comment stepKey="deleteImageCB" userInput="Delete image B"/>
1545+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
1546+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1547+
</actionGroup>
1548+
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay2" visible="true"/>
1549+
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>-->
1550+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeMainImageSource2"/>
1551+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
1552+
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage3"/>
1553+
1554+
</test>
14321555
</tests>

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

Lines changed: 52 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<title value="Image from Image Content Block get wiped out after delete image from Media Storage"/>
1616
<description value="Image from Image Content Block get wiped out after delete image from Media Storage"/>
1717
<severity value="CRITICAL"/>
18-
<useCaseId value=""/>
18+
<useCaseId value="MC-2294"/>
1919
<testCaseId value=""/>
20-
<group value=""/>
20+
<group value="pagebuilder"/>
2121
<group value="pagebuilder-image"/>
2222
</annotations>
2323
<before>
@@ -42,62 +42,75 @@
4242
<actionGroup ref="addImageToStage" stepKey="addImageToStage">
4343
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
4444
</actionGroup>
45-
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut1">
46-
<argument name="property" value="PageBuilderImageProperty_JPG2"/>
45+
<!-- Go to Media Storage from stage-->
46+
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage"/>
47+
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
48+
<argument name="contentType" value="PageBuilderImageContentType"/>
49+
<argument name="section" value="ImageOnStage"/>
4750
</actionGroup>
4851
<!--Delete image A-->
4952
<comment stepKey="deleteImageA" userInput="Delete image A"/>
5053
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
51-
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
54+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
5255
</actionGroup>
5356
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
54-
<dontSeeElementInDOM selector="" stepKey="dontSeeImageOnStage1"/>
57+
<comment userInput="Assert not to see deleted imgae on stage" stepKey="assertNotToSeeImage"/>
58+
<seeElementInDOM selector=".pagebuilder-image-empty-preview" stepKey="dontSeeImageOnStage1"/>
5559

56-
<!-- Attach image B to Media Storage -->
57-
<comment userInput="Attach image B to Media Storage stage" stepKey="attachImageToMediaStorage"/>
60+
<!-- Attach image C to Image slideout form -->
61+
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
62+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
63+
<argument name="contentType" value="PageBuilderImageContentType"/>
64+
</actionGroup>
65+
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageFile1">
66+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
67+
</actionGroup>
68+
<actionGroup ref="verifyImageOnSlideout" stepKey="verifyImageOnSlideout1">
69+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
70+
</actionGroup>
71+
<!--Delete image C-->
5872
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
59-
<argument name="property" value="PageBuilderImageProperty_JPG2"/>
73+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
74+
</actionGroup>
75+
<comment stepKey="deleteImageC" userInput="Delete image C"/>
76+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
77+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
78+
</actionGroup>
79+
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>
80+
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>-->
81+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeMainImageSource"/>
82+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
83+
<seeElementInDOM selector=".pagebuilder-image-empty-preview" stepKey="dontSeeImageOnStage2"/>
84+
85+
<!-- Attach image B to Image slideout form from Media Storage -->
86+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
87+
<argument name="contentType" value="PageBuilderImageContentType"/>
6088
</actionGroup>
89+
<click selector="{{EditPanelForm.selectFromGalleryBtnInitial('general','image')}}" stepKey="clickSelectfromGallery"/>
90+
<waitForPageLoad stepKey="waitForPageLoad"/>
6191
<actionGroup ref="CreateImageFolder" stepKey="createImageFolder">
6292
<argument name="ImageFolder" value="ImageFolder"/>
6393
</actionGroup>
6494
<actionGroup ref="attachImage" stepKey="SelectImageFromMediaStorage">
6595
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
6696
</actionGroup>
6797
<actionGroup ref="saveImage" stepKey="saveImage"/>
68-
<seeElementInDOM selector="" stepKey="seeImageOnStage1"/>
69-
<!--Delete image B-->
70-
<comment stepKey="deleteImageB" userInput="Delete image B"/>
71-
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut3">
72-
<argument name="property" value="PageBuilderImageProperty_JPG2"/>
73-
</actionGroup>
74-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
75-
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
76-
</actionGroup>
77-
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut2"/>
78-
<dontSeeElementInDOM selector="" stepKey="dontSeeImageOnStage2"/>
79-
80-
<!-- Attach image C to Image slideout form -->
81-
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
82-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
83-
<argument name="contentType" value="PageBuilderImageContentType"/>
84-
</actionGroup>
85-
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageFile1">
86-
<argument name="property" value="PageBuilderImageProperty_JPG2"/>
98+
<actionGroup ref="verifyImageOnSlideout" stepKey="verifyImageOnSlideout2">
99+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
87100
</actionGroup>
88-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
89-
<seeElementInDOM selector="" stepKey="seeImageOnStage2"/>
90-
<!--Delete image C-->
91-
<comment stepKey="deleteImageC" userInput="Delete image C"/>
92-
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut4">
93-
<argument name="property" value="PageBuilderImageProperty_JPG2"/>
101+
<!--Delete image B-->
102+
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut2">
103+
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
94104
</actionGroup>
95-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
96-
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
105+
<comment stepKey="deleteImageCB" userInput="Delete image B"/>
106+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
107+
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
97108
</actionGroup>
98-
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>
99-
<dontSeeElementInDOM selector="" stepKey="dontSeeImageOnStage3"/>
100-
109+
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay2" visible="true"/>
110+
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>-->
111+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeMainImageSource2"/>
112+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
113+
<seeElementInDOM selector=".pagebuilder-image-empty-preview" stepKey="dontSeeImageOnStage3"/>
101114
</test>
102115
<test name="ImageAddImageIntoPageBuilderStage">
103116
<annotations>

0 commit comments

Comments
 (0)