Skip to content

Commit 32623a1

Browse files
anthoulaanthoula
committed
Merge branch 'MC-4293-dblock-image' of github.com:magento-obsessive-owls/magento2-page-builder into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup.xml
2 parents b1e9d26 + fc18ba3 commit 32623a1

File tree

5 files changed

+139
-0
lines changed

5 files changed

+139
-0
lines changed

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,30 @@
6161
<actualResult type="variable">bottomPositionRatio</actualResult>
6262
</assertEquals>
6363
</actionGroup>
64+
<actionGroup name="verifyAlignmentRightInBlock">
65+
<arguments>
66+
<argument name="block" defaultValue="BlockOnStorefront"/>
67+
<argument name="container" type="string"/>
68+
<argument name="content" type="string"/>
69+
<argument name="containerPadding"/>
70+
<argument name="index" defaultValue="1" type="string"/>
71+
</arguments>
72+
<!-- Verify container width is larger than content width -->
73+
<comment userInput="Verify container width is larger than content width" stepKey="commentVerifyWidth"/>
74+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container}}')[{{index}}-1].clientWidth;" stepKey="containerWidth"/>
75+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content}}')[{{index}}-1].clientWidth;" stepKey="contentWidth"/>
76+
<assertGreaterThan stepKey="assertContainerHeightIsGreater">
77+
<expectedResult type="variable">contentWidth</expectedResult>
78+
<actualResult type="variable">containerWidth</actualResult>
79+
</assertGreaterThan>
80+
<!-- Verify position right of container matches content -->
81+
<comment userInput="Verify position right of container matches content" stepKey="commentVerifyRightPosition"/>
82+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container}}')[{{index}}-1].getBoundingClientRect().right-{{containerPadding.paddingRight}};" stepKey="containerRightMinusPadding"/>
83+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content}}')[{{index}}-1].getBoundingClientRect().right;" stepKey="contentRight"/>
84+
<executeJS function="return Math.round(({$containerRightMinusPadding}/{$contentRight})*100)/100" stepKey="rightPositionRatio"/>
85+
<assertEquals stepKey="assertRightPositionRatio">
86+
<expectedResult type="int">1</expectedResult>
87+
<actualResult type="variable">rightPositionRatio</actualResult>
88+
</assertEquals>
89+
</actionGroup>
6490
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@
3333
<data key="extension">jpg</data>
3434
<data key="path">wysiwyg</data>
3535
</entity>
36+
<entity name="PageBuilderImageProperty_PNG" type="pagebuilder_image_property">
37+
<data key="name">Image</data>
38+
<data key="section">general</data>
39+
<data key="fieldName">image</data>
40+
<data key="value">magento-logo.png</data>
41+
<data key="file">magento-logo.png</data>
42+
<data key="fileName">magento-logo</data>
43+
<data key="extension">png</data>
44+
<data key="path">wysiwyg</data>
45+
</entity>
3646
<entity name="PageBuilderImageProperty_StageJPG" type="pagebuilder_image_property">
3747
<data key="name">Image</data>
3848
<data key="section">general</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<element name="backgroundImageSource" type="text" selector="//div[contains(@style,'{{var1}}')]" parameterized="true"/>
4343
<element name="imageDisplay" type="button" selector="figure[data-role='image']"/>
4444
<element name="imageElement" type="button" selector="figure[data-role='image'] img:nth-child({{arg1}})" parameterized="true"/>
45+
<element name="imageElementCSS" type="text" selector="figure[data-role=image] img" parameterized="true"/>
4546
<element name="imageHasAltText" type="button" selector="img.pagebuilder-mobile-hidden[alt='{{arg1}}']" parameterized="true"/>
4647
<element name="imageHasCaption" type="button" selector="figcaption"/>
4748
<element name="imageHasTitleTag" type="button" selector="img.pagebuilder-mobile-hidden[title='{{arg1}}']" parameterized="true"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@
7575
<element name="base" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div" parameterized="true"/>
7676
<element name="baseCSS" type="text" selector="[data-role=row]"/>
7777
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row] > div')[{{arg1}} - 1]" parameterized="true"/>
78+
<element name="baseCSS" type="text" selector="[data-role=row]"/>
79+
<element name="innerCSS" type="text" selector="[data-role=row] [data-element=inner]"/>
7880
<element name="hidden" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
7981
<element name="notHidden" type="text" selector="(//div[@data-role='row'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
8082
<element name="computedWidth" type="text" selector="parseInt(window.getComputedStyle(document.querySelector('[data-role=row]')).width)"/>

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

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,106 @@
994994
<seeElementInDOM selector="{{ImageOnStorefront.imageDisplay}}" stepKey="seeThatEmptyImageExistsInDomOnStorefront"/>
995995
<dontSeeElement selector="{{ImageOnStorefront.imageDisplay}}" stepKey="notSeeImageOnFrontend"/>
996996
</test>
997+
<test name="BlockImageIsRightAligned">
998+
<annotations>
999+
<features value="PageBuilder"/>
1000+
<stories value="Block"/>
1001+
<title value="Image Can Be Right Aligned In Block"/>
1002+
<description value="A user can right align an image in a Block"/>
1003+
<severity value="MAJOR"/>
1004+
<useCaseId value="MC-4293"/>
1005+
<testCaseId value="MC-5174"/>
1006+
<group value="pagebuilder"/>
1007+
<group value="pagebuilder-block"/>
1008+
<group value="pagebuilder-image"/>
1009+
</annotations>
1010+
<before>
1011+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1012+
<createData entity="_defaultBlock" stepKey="createPreReqBlock"/>
1013+
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
1014+
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage">
1015+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
1016+
</actionGroup>
1017+
</before>
1018+
<after>
1019+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
1020+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
1021+
<actionGroup ref="navigateToMediaGallery" stepKey="navigateToMediaGallery"/>
1022+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
1023+
<argument name="FolderName" value="{{PageBuilderImageProperty_PNG.path}}"/>
1024+
</actionGroup>
1025+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
1026+
<argument name="Image" value="PageBuilderImageProperty_PNG"/>
1027+
</actionGroup>
1028+
<actionGroup ref="logout" stepKey="logout"/>
1029+
</after>
1030+
<!-- Go to edit page of Block and configure Image -->
1031+
<comment userInput="Go to edit page of Block and configure image" stepKey="commentGoToBlockEditPage"/>
1032+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1033+
<argument name="group" value="PageBuilderImageContentType"/>
1034+
</actionGroup>
1035+
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage">
1036+
<argument name="contentType" value="PageBuilderImageContentType"/>
1037+
</actionGroup>
1038+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1039+
<argument name="contentType" value="PageBuilderImageContentType"/>
1040+
</actionGroup>
1041+
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageFile">
1042+
<argument name="property" value="PageBuilderImageProperty_PNG"/>
1043+
</actionGroup>
1044+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterImageCaptionProperty">
1045+
<argument name="property" value="PageBuilderImageCaptionProperty"/>
1046+
</actionGroup>
1047+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1048+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
1049+
</actionGroup>
1050+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsInBlock"/>
1051+
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickSaveBlock"/>
1052+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
1053+
<!-- Go to CMS Page and choose Block -->
1054+
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage"/>
1055+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
1056+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1057+
</actionGroup>
1058+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
1059+
<argument name="group" value="PageBuilderBlockContentType"/>
1060+
</actionGroup>
1061+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
1062+
<argument name="contentType" value="PageBuilderBlockContentType"/>
1063+
</actionGroup>
1064+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
1065+
<argument name="block" value="$$createPreReqBlock$$"/>
1066+
</actionGroup>
1067+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1068+
<!-- Verify Right Alignment On Stage - Before Save -->
1069+
<comment userInput="Verify right alignment on stage before save" stepKey="commentVerifyRightAlignmentOnStageBeforeSave"/>
1070+
<seeElement selector="({{ImageOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyRight.value)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeImageAlignmentRightBeforeSave"/>
1071+
<actionGroup ref="verifyAlignmentRightInBlock" stepKey="verifyAlignmentRightInBlockBeforeSave">
1072+
<argument name="container" value="{{RowOnStorefront.innerCSS}}"/>
1073+
<argument name="content" value="{{ImageOnStorefront.imageElementCSS}}"/>
1074+
<argument name="containerPadding" value="PageBuilderPaddingProperty10"/>
1075+
</actionGroup>
1076+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1077+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
1078+
<!-- Verify Right Alignment On Stage - After Save -->
1079+
<comment userInput="Verify right alignment on stage after save" stepKey="commentVerifyRightAlignmentOnStageAfterSave"/>
1080+
<seeElement selector="({{ImageOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyRight.value)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeImageAlignmentRightAfterSave"/>
1081+
<actionGroup ref="verifyAlignmentRightInBlock" stepKey="verifyAlignmentRightInBlockAfterSave">
1082+
<argument name="container" value="{{RowOnStorefront.innerCSS}}"/>
1083+
<argument name="content" value="{{ImageOnStorefront.imageElementCSS}}"/>
1084+
<argument name="containerPadding" value="PageBuilderPaddingProperty10"/>
1085+
</actionGroup>
1086+
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnStorefrontCMSPage" />
1087+
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
1088+
<!-- Verify Right Alignment In Storefront -->
1089+
<comment userInput="Verify right alignment in storefront" stepKey="commentVerifyRightAlignmentInStorefront"/>
1090+
<seeElement selector="({{ImageOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyRight.value)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeImageAlignmentRightStorefront"/>
1091+
<actionGroup ref="verifyAlignmentRightInBlock" stepKey="verifyAlignmentRightInBlockStorefront">
1092+
<argument name="container" value="{{RowOnStorefront.innerCSS}}"/>
1093+
<argument name="content" value="{{ImageOnStorefront.imageElementCSS}}"/>
1094+
<argument name="containerPadding" value="PageBuilderPaddingProperty10"/>
1095+
</actionGroup>
1096+
</test>
9971097
<test name="ValidateShowHideOnBlockDefaultState">
9981098
<annotations>
9991099
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)