Skip to content

Commit e8393a9

Browse files
nathanjosiahnathanjosiah
committed
Merge branch 'MC-2294' of github.com:magento-trigger/magento2-page-builder into MC-2294
2 parents e04cba5 + 6f9d5b7 commit e8393a9

File tree

5 files changed

+114
-57
lines changed

5 files changed

+114
-57
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<arguments>
3434
<argument name="property"/>
3535
</arguments>
36-
<comment userInput="Verify image A display on preview of slide-out" stepKey="commentVerifyImage"/>
36+
<comment userInput="Verify image display on preview of slide-out" stepKey="commentVerifyImage"/>
3737
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(property.value)}}" stepKey="seeImageNameOnPreview"/>
3838
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="seeMainImageSource"/>
3939
</actionGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-role=slide]')).boxSizing"/>
121121
</section>
122122
<section name="SlideOnBackend">
123+
<element name="imageOnStage" selector="//div[contains(@style,'{{arg1}}') and contains(@class,'pagebuilder-slide-wrapper')]" type="text" parameterized="true"/>
123124
<element name="all" type="button" selector=".pagebuilder-slide"/>
124125
<element name="openOptionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]" parameterized="true"/>
125126
<element name="optionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]//li[contains(@class,'pagebuilder-options-link')]" parameterized="true"/>

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

Lines changed: 39 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,92 +1464,77 @@
14641464
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
14651465
</actionGroup>
14661466
<!-- Go to Media Storage from stage-->
1467-
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage"/>
1467+
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage1"/>
14681468
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
14691469
<argument name="contentType" value="PageBuilderBannerContentType"/>
14701470
<argument name="section" value="ImageOnStage"/>
14711471
</actionGroup>
14721472
<!--Delete image A-->
14731473
<comment stepKey="deleteImageA" userInput="Delete image A"/>
14741474
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
1475-
<argument name="Image" value="PageBuilderBackgroundImage_JPGv"/>
1475+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
14761476
</actionGroup>
14771477
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
1478-
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage"/>
1478+
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage1"/>
14791479
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage1"/>
14801480

14811481

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-
1482+
<!--&lt;!&ndash; Attach image B to Media Storage &ndash;&gt;-->
1483+
<!--<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage2"/>-->
1484+
<!--<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage2" >-->
1485+
<!--<argument name="contentType" value="PageBuilderBannerContentType"/>-->
1486+
<!--<argument name="section" value="ImageOnStage"/>-->
1487+
<!--</actionGroup>-->
1488+
<!--<waitForLoadingMaskToDisappear stepKey="waitForLoading2" />-->
1489+
<!--<actionGroup ref="CreateImageFolder" stepKey="createImageFolder1">-->
1490+
<!--<argument name="ImageFolder" value="ImageFolder"/>-->
1491+
<!--</actionGroup>-->
1492+
<!--<actionGroup ref="attachImage" stepKey="attachImageFile2">-->
1493+
<!--<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>-->
1494+
<!--</actionGroup>-->
1495+
<!--<actionGroup ref="saveImage" stepKey="saveImage2"/>-->
1496+
<!--<waitForElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="seeImageInDOM"/>-->
1497+
<!--<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage3"/>-->
1498+
<!--<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage3" >-->
1499+
<!--<argument name="contentType" value="PageBuilderBannerContentType"/>-->
1500+
<!--<argument name="section" value="ImageOnStage"/>-->
1501+
<!--</actionGroup>-->
1502+
<!--&lt;!&ndash;Delete image B&ndash;&gt;-->
1503+
<!--<comment stepKey="deleteImageB" userInput="Delete image B"/>-->
1504+
<!--<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">-->
1505+
<!--<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>-->
1506+
<!--</actionGroup>-->
1507+
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut2"/>-->
1508+
<!--<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage2"/>-->
1509+
<!--<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage4"/>-->
14951510

14961511

14971512

14981513

14991514
<!-- Attach image C to Image slideout form -->
15001515
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
1501-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
1502-
<argument name="contentType" value="PageBuilderImageContentType"/>
1516+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1517+
<argument name="contentType" value="PageBuilderBannerContentType"/>
15031518
</actionGroup>
15041519
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageFile1">
1505-
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1520+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
15061521
</actionGroup>
1507-
<actionGroup ref="verifyImageOnSlideout" stepKey="verifyImageOnSlideout1">
1508-
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1522+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOut1">
1523+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
15091524
</actionGroup>
15101525
<!--Delete image C-->
15111526
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
1512-
<argument name="property" value="PageBuilderImageProperty_StageJPG"/>
1527+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
15131528
</actionGroup>
15141529
<comment stepKey="deleteImageC" userInput="Delete image C"/>
15151530
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
1516-
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
1531+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
15171532
</actionGroup>
15181533
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>
15191534
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>-->
1520-
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_StageJPG.fileName)}}" stepKey="seeMainImageSource"/>
1535+
<dontSeeElementInDOM selector="{{EditPanelForm.editFormUploadedImageSource(PageBuilderBackgroundImage_JPG.section, PageBuilderBackgroundImage_JPG.fieldName, PageBuilderBackgroundImage_JPG.fileName, PageBuilderBackgroundImage_JPG.extension)}}" stepKey="seeUploadedFile"/>
15211536
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
15221537
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage2"/>
15231538

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-
15541539
</test>
15551540
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<severity value="CRITICAL"/>
1818
<useCaseId value="MC-2294"/>
1919
<testCaseId value=""/>
20-
<group value="pagebuilder"/>
20+
<group value="kieu"/>
2121
<group value="pagebuilder-image"/>
2222
</annotations>
2323
<before>
@@ -121,7 +121,7 @@
121121
<severity value="CRITICAL"/>
122122
<useCaseId value="MAGETWO-71618"/>
123123
<testCaseId value="MC-1334"/>
124-
<group value="pagebuilder"/>
124+
<group value="pagebuilder-"/>
125125
<group value="pagebuilder-image"/>
126126
</annotations>
127127
<before>

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,4 +1856,75 @@
18561856
<argument name="containerTargetIndex" value="2"/>
18571857
</actionGroup>
18581858
</test>
1859+
<test name="SliderContentBlockDeleteImage">
1860+
<annotations>
1861+
<features value="PageBuilder"/>
1862+
<stories value="Slider"/>
1863+
<title value="Image from Slider Content Block get wiped out after delete image from Media Storage"/>
1864+
<description value="Image from Slider Content Block get wiped out after delete image from Media Storage"/>
1865+
<severity value="CRITICAL"/>
1866+
<useCaseId value="MC-2294"/>
1867+
<testCaseId value=""/>
1868+
<group value="pagebuilder"/>
1869+
<group value="pagebuilder-image"/>
1870+
<group value="pagebuilder-slider"/>
1871+
</annotations>
1872+
<before>
1873+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1874+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1875+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1876+
</before>
1877+
<after>
1878+
<actionGroup ref="logout" stepKey="logout"/>
1879+
</after>
1880+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1881+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1882+
</actionGroup>
1883+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1884+
<argument name="group" value="PageBuilderSliderContentType"/>
1885+
</actionGroup>
1886+
<actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage">
1887+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1888+
</actionGroup>
1889+
<!--Upload image from local machine using image placeholder button-->
1890+
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachSlideImageFile1">
1891+
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
1892+
</actionGroup>
1893+
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageName(PageBuilderSlideBackgroundImageProperty1.value)}}" stepKey="waitForUploadImage1" />
1894+
<seeElement selector="{{ImageOnConfigurationPanel.imageName(PageBuilderSlideBackgroundImageProperty1.value)}}" stepKey="seeImageNameOnPreview1"/>
1895+
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut1">
1896+
<argument name="property" value="PageBuilderSlideBackgroundImageProperty1"/>
1897+
</actionGroup>
1898+
<comment stepKey="deleteImageB" userInput="Delete image C"/>
1899+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
1900+
<argument name="Image" value="PageBuilderSlideBackgroundImageProperty1"/>
1901+
</actionGroup>
1902+
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeStorage"/>
1903+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings1"/>
1904+
<!--<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay1" visible="true"/>-->
1905+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
1906+
<dontSeeElementInDOM selector="{{ImageOnConfigurationPanel.imageName(PageBuilderSlideBackgroundImageProperty1.value)}}" stepKey="dontSeeImageNameOnPreview1"/>
1907+
1908+
1909+
<!--Upload image from local machine -->
1910+
<comment userInput="Upload image from local machine" stepKey="commentUploadImageFromLocal1" />
1911+
<attachFile userInput="{{PageBuilderSlideBackgroundImageProperty2.value}}" selector="{{PageBuilderStage.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
1912+
<waitForPageLoad stepKey="waitForPageLoad4" />
1913+
<waitForElementVisible selector="{{SlideOnBackend.imageOnStage(PageBuilderSlideBackgroundImageProperty2.fileName)}}" stepKey="waitForMainImageSource1"/>
1914+
1915+
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>
1916+
<waitForElementVisible selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />
1917+
<click selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="clickSelectFromGallery" />
1918+
<waitForPageLoad stepKey="waitForPageLoad2" />
1919+
<waitForLoadingMaskToDisappear stepKey="waitForLoading2" />
1920+
<!--Delete image A-->
1921+
<comment stepKey="deleteImageA" userInput="Delete image A"/>
1922+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
1923+
<argument name="Image" value="PageBuilderSlideBackgroundImageProperty2"/>
1924+
</actionGroup>
1925+
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
1926+
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage1"/>
1927+
<dontSeeElementInDOM selector="{{SlideOnBackend.imageOnStage(PageBuilderSlideBackgroundImageProperty2.fileName)}}" stepKey="dontSeeImageInrMainImageSource1"/>
1928+
1929+
</test>
18591930
</tests>

0 commit comments

Comments
 (0)