Skip to content

Commit 84afbd5

Browse files
kieuphan2406kieuphan2406
committed
MC-3053: Automate MFTF for MC-2294
1 parent 7bfcfce commit 84afbd5

10 files changed

+73
-107
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +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">
32+
<actionGroup name="uploadImageToContentTypeFromStage">
3333
<arguments>
3434
<argument name="property"/>
3535
</arguments>
36-
<comment userInput="Attach image A to Banner stage" stepKey="commentAttach"/>
3736
<attachFile userInput="{{property.value}}" selector="{{PageBuilderStage.uploadLocalImageBtn}}" stepKey="attachImageFromLocalToStage"/>
37+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
3838
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(property.fileName)}}" stepKey="waitForMainImageSource1"/>
3939
</actionGroup>
4040
</actionGroups>

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,4 @@
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>
5340
</actionGroups>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,17 @@
5757
<waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(containerTargetType.role, containerTargetIndex)}}" stepKey="waitForContentTypeStage"/>
5858
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="dontSeeContentTypeInContainer"/>
5959
</actionGroup>
60+
<actionGroup name="goToMediaStorageFromStage">
61+
<arguments>
62+
<argument name="contentType"/>
63+
<argument name="section"/>
64+
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
65+
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
66+
</arguments>
67+
<comment userInput="Hover over content type in stage and click Select From Gallery button" stepKey="commentHover"/>
68+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverImageContentTypeStage"/>
69+
<waitForElementVisible selector="{{section.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />
70+
<click selector="{{section.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn1" />
71+
<waitForPageLoad stepKey="waitForPageLoad"/>
72+
</actionGroup>
6073
</actionGroups>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
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']" />
7473
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
7574
<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"/>
7675
<element name="backgroundImageSource" type="button" selector="//div[contains(@style, '{{arg1}}')]" parameterized="true"/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
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"/>
4948
</section>
5049
<section name="AdvancedForm">
5150
<element name="sectionName" type="button" selector="//div[@data-index='advanced']"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +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"/>
123+
<!--<element name="imageOnStage" selector="//div[contains(@style,'{{arg1}}') and contains(@class,'pagebuilder-slide-wrapper')]" type="text" parameterized="true"/>-->
124124
<element name="all" type="button" selector=".pagebuilder-slide"/>
125125
<element name="openOptionsMenu" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{arg1}}]" parameterized="true"/>
126126
<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/Section/PageBuilderStageSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<element name="computedWidthOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-{{arg1}}:nth-of-type({{arg2}})')).width)" parameterized="true"/>
3333
<element name="uploadLocalImageBtn" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
3434
<element name="uploadNewImageBtn" type="button" selector="//label[text()='Upload Image']" />
35-
<element name="selectFromGalleryImageBtn" type="button" selector="//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']"/>
35+
<element name="selectFromGalleryImageBtn" type="button" selector="//div[@data-index='{{arg1}}']//input[@name='{{arg2}}']//following-sibling::label[text()='Select from Gallery']" parameterized="true"/>
3636
</section>
3737
<section name="PageBuilderPanel">
3838
<element name="searchField" type="input" selector='//*[@id="pagebuilder-panel"]/div[1]/a'/>

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

Lines changed: 14 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,12 +1435,13 @@
14351435
<stories value="Banner"/>
14361436
<title value="Image from Banner Content Block get wiped out after delete image from Media Storage"/>
14371437
<description value="Image from Banner Content Block get wiped out after delete image from Media Storage"/>
1438-
<severity value="CRITICAL"/>
1438+
<severity value="MAJOR"/>
14391439
<useCaseId value="MC-2294"/>
1440-
<testCaseId value=""/>
1440+
<testCaseId value="MC-3494"/>
14411441
<group value="pagebuilder"/>
14421442
<group value="pagebuilder-image"/>
14431443
<group value="pagebuilder-banner"/>
1444+
<group value="pagebuilder-bannerCommon"/>
14441445
</annotations>
14451446
<before>
14461447
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -1460,81 +1461,46 @@
14601461
<argument name="contentType" value="PageBuilderBannerContentType"/>
14611462
</actionGroup>
14621463
<!-- Attach image A to PageBuilder stage -->
1463-
<actionGroup ref="addImageToBannerStage" stepKey="addImageToStage">
1464+
<comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttachImage"/>
1465+
<actionGroup ref="uploadImageToContentTypeFromStage" stepKey="addImageToStage">
14641466
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
14651467
</actionGroup>
1466-
<!-- Go to Media Storage from stage-->
1468+
<!-- Go to Media Storage from stage -->
14671469
<comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage1"/>
14681470
<actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1" >
14691471
<argument name="contentType" value="PageBuilderBannerContentType"/>
14701472
<argument name="section" value="ImageOnStage"/>
14711473
</actionGroup>
1472-
<!--Delete image A-->
1474+
<!-- Delete image A -->
14731475
<comment stepKey="deleteImageA" userInput="Delete image A"/>
14741476
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
14751477
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
14761478
</actionGroup>
14771479
<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut1"/>
14781480
<comment userInput="Assert not to see deleted image on stage" stepKey="assertNotToSeeImage1"/>
1479-
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage1"/>
1480-
1481-
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"/>-->
1510-
1511-
1512-
1513-
1481+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="dontSeeImageOnStage1"/>
15141482
<!-- Attach image C to Image slideout form -->
15151483
<comment userInput="Attach image C to Image slideout form" stepKey="attachImageToSlideOut"/>
15161484
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
15171485
<argument name="contentType" value="PageBuilderBannerContentType"/>
15181486
</actionGroup>
1519-
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageFile1">
1487+
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachImageFile1">
15201488
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
15211489
</actionGroup>
15221490
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOut1">
15231491
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
15241492
</actionGroup>
1525-
<!--Delete image C-->
1493+
<!-- Delete image C -->
1494+
<comment stepKey="deleteImageC" userInput="Delete image C"/>
15261495
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
15271496
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
15281497
</actionGroup>
1529-
<comment stepKey="deleteImageC" userInput="Delete image C"/>
15301498
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
15311499
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
15321500
</actionGroup>
1533-
<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>
1534-
<!--<click selector="{{MediaGallerySection.CancelBtn}}" stepKey="closeSlideOut3"/>-->
1535-
<dontSeeElementInDOM selector="{{EditPanelForm.editFormUploadedImageSource(PageBuilderBackgroundImage_JPG.section, PageBuilderBackgroundImage_JPG.fieldName, PageBuilderBackgroundImage_JPG.fileName, PageBuilderBackgroundImage_JPG.extension)}}" stepKey="seeUploadedFile"/>
1501+
<!--<conditionalClick selector=".modals-overlay" dependentSelector=".modals-overlay" stepKey="clickOverlay" visible="true"/>-->
1502+
<dontSeeElementInDOM selector="{{EditPanelForm.editFormUploadedImageSource(PageBuilderBackgroundImage_JPG.section, PageBuilderBackgroundImage_JPG.fieldName, PageBuilderBackgroundImage_JPG.fileName, PageBuilderBackgroundImage_JPG.extension)}}" stepKey="dontSeeImage"/>
15361503
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
1537-
<seeElementInDOM selector=".pagebuilder-empty-banner" stepKey="dontSeeImageOnStage2"/>
1538-
1504+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="dontSeeImageOnStage2"/>
15391505
</test>
15401506
</tests>

0 commit comments

Comments
 (0)