Skip to content

Commit fc18ba3

Browse files
anthoulaanthoula
committed
MC-4293: Image Alignment Hard Coded to Center On Storefront When Rendered Through Dynamic Block
- update actiongroup to accept any selector for content and container - update test ids
1 parent 9a21749 commit fc18ba3

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@
3939
<actionGroup name="verifyAlignmentRightInBlock">
4040
<arguments>
4141
<argument name="block" defaultValue="BlockOnStorefront"/>
42-
<argument name="container"/>
43-
<argument name="content"/>
44-
<argument name="padding"/>
42+
<argument name="container" type="string"/>
43+
<argument name="content" type="string"/>
44+
<argument name="containerPadding"/>
4545
<argument name="index" defaultValue="1" type="string"/>
4646
</arguments>
4747
<!-- Verify container width is larger than content width -->
4848
<comment userInput="Verify container width is larger than content width" stepKey="commentVerifyWidth"/>
49-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.innerCSS}}')[{{index}}-1].clientWidth;" stepKey="containerWidth"/>
50-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{index}}-1].clientWidth;" stepKey="contentWidth"/>
49+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container}}')[{{index}}-1].clientWidth;" stepKey="containerWidth"/>
50+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content}}')[{{index}}-1].clientWidth;" stepKey="contentWidth"/>
5151
<assertGreaterThan stepKey="assertContainerHeightIsGreater">
5252
<expectedResult type="variable">contentWidth</expectedResult>
5353
<actualResult type="variable">containerWidth</actualResult>
5454
</assertGreaterThan>
5555
<!-- Verify position right of container matches content -->
5656
<comment userInput="Verify position right of container matches content" stepKey="commentVerifyRightPosition"/>
57-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.innerCSS}}')[{{index}}-1].getBoundingClientRect().right-{{padding.paddingRight}};" stepKey="containerRightMinusPadding"/>
58-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{index}}-1].getBoundingClientRect().right;" stepKey="contentRight"/>
57+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container}}')[{{index}}-1].getBoundingClientRect().right-{{containerPadding.paddingRight}};" stepKey="containerRightMinusPadding"/>
58+
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content}}')[{{index}}-1].getBoundingClientRect().right;" stepKey="contentRight"/>
5959
<executeJS function="return Math.round(({$containerRightMinusPadding}/{$contentRight})*100)/100" stepKey="rightPositionRatio"/>
6060
<assertEquals stepKey="assertRightPositionRatio">
6161
<expectedResult type="int">1</expectedResult>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +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="baseCSS" type="text" selector="figure[data-role=image] img" parameterized="true"/>
45+
<element name="imageElementCSS" type="text" selector="figure[data-role=image] img" parameterized="true"/>
4646
<element name="imageHasAltText" type="button" selector="img.pagebuilder-mobile-hidden[alt='{{arg1}}']" parameterized="true"/>
4747
<element name="imageHasCaption" type="button" selector="figcaption"/>
4848
<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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575
<element name="base" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div" parameterized="true"/>
7676
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row] > div')[{{arg1}} - 1]" parameterized="true"/>
7777
<element name="baseCSS" type="text" selector="[data-role=row]"/>
78+
<element name="innerCSS" type="text" selector="[data-role=row] [data-element=inner]"/>
7879
<element name="hidden" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
7980
<element name="notHidden" type="text" selector="(//div[@data-role='row'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
8081
<element name="computedWidth" type="text" selector="parseInt(window.getComputedStyle(document.querySelector('[data-role=row]')).width)"/>
8182
<element name="rowStyle" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style, '{{arg2}}')]" parameterized="true"/>
8283
<element name="rowWidthJS" type="text" selector="document.querySelectorAll('[data-appearance=\'{{arg1}}\']')[{{arg2}}].clientWidth" parameterized="true"/>
8384
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] h2')[{{arg2}}].clientWidth" parameterized="true"/>
8485
<element name="appearance" type="text" selector="(//div[@data-role='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
85-
<element name="innerCSS" type="text" selector="[data-role=row] [data-element=inner]"/>
8686
<!-- Background Configuration -->
8787
<element name="backgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
8888
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='row'])[{{arg1}}]/div[not(contains(@style,'background-color:'))]" parameterized="true"/>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -982,8 +982,8 @@
982982
<title value="Image Can Be Right Aligned In Block"/>
983983
<description value="A user can right align an image in a Block"/>
984984
<severity value="MAJOR"/>
985-
<testCaseId value="MC-4293"/>
986-
<useCaseId value="MC-5174"/>
985+
<useCaseId value="MC-4293"/>
986+
<testCaseId value="MC-5174"/>
987987
<group value="pagebuilder"/>
988988
<group value="pagebuilder-block"/>
989989
<group value="pagebuilder-image"/>
@@ -1050,29 +1050,29 @@
10501050
<comment userInput="Verify right alignment on stage before save" stepKey="commentVerifyRightAlignmentOnStageBeforeSave"/>
10511051
<seeElement selector="({{ImageOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyRight.value)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeImageAlignmentRightBeforeSave"/>
10521052
<actionGroup ref="verifyAlignmentRightInBlock" stepKey="verifyAlignmentRightInBlockBeforeSave">
1053-
<argument name="container" value="RowOnStorefront"/>
1054-
<argument name="content" value="ImageOnStorefront"/>
1055-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1053+
<argument name="container" value="{{RowOnStorefront.innerCSS}}"/>
1054+
<argument name="content" value="{{ImageOnStorefront.imageElementCSS}}"/>
1055+
<argument name="containerPadding" value="PageBuilderPaddingProperty10"/>
10561056
</actionGroup>
10571057
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
10581058
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
10591059
<!-- Verify Right Alignment On Stage - After Save -->
10601060
<comment userInput="Verify right alignment on stage after save" stepKey="commentVerifyRightAlignmentOnStageAfterSave"/>
10611061
<seeElement selector="({{ImageOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyRight.value)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeImageAlignmentRightAfterSave"/>
10621062
<actionGroup ref="verifyAlignmentRightInBlock" stepKey="verifyAlignmentRightInBlockAfterSave">
1063-
<argument name="container" value="RowOnStorefront"/>
1064-
<argument name="content" value="ImageOnStorefront"/>
1065-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1063+
<argument name="container" value="{{RowOnStorefront.innerCSS}}"/>
1064+
<argument name="content" value="{{ImageOnStorefront.imageElementCSS}}"/>
1065+
<argument name="containerPadding" value="PageBuilderPaddingProperty10"/>
10661066
</actionGroup>
10671067
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnStorefrontCMSPage" />
10681068
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
10691069
<!-- Verify Right Alignment In Storefront -->
10701070
<comment userInput="Verify right alignment in storefront" stepKey="commentVerifyRightAlignmentInStorefront"/>
10711071
<seeElement selector="({{ImageOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyRight.value)}}{{BlockOnStorefront.ancestor}})[1]" stepKey="seeImageAlignmentRightStorefront"/>
10721072
<actionGroup ref="verifyAlignmentRightInBlock" stepKey="verifyAlignmentRightInBlockStorefront">
1073-
<argument name="container" value="RowOnStorefront"/>
1074-
<argument name="content" value="ImageOnStorefront"/>
1075-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
1073+
<argument name="container" value="{{RowOnStorefront.innerCSS}}"/>
1074+
<argument name="content" value="{{ImageOnStorefront.imageElementCSS}}"/>
1075+
<argument name="containerPadding" value="PageBuilderPaddingProperty10"/>
10761076
</actionGroup>
10771077
</test>
10781078
<test name="ValidateShowHideOnBlockDefaultState">

0 commit comments

Comments
 (0)