Skip to content

Commit 297b5ff

Browse files
committed
MC-1263: Buttons of Image Content Block are not aligned correctly
- Added mftf assertions to verify new class behavior
1 parent 896ebc7 commit 297b5ff

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<element name="columnResizeGridLine" type="block" selector=".resize-grid .grid-line:nth-child({{arg}})" parameterized="true"/>
2121
<element name="columnStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')][{{arg1}}][contains(@style, '{{arg2}}')]" parameterized="true"/>
2222
<element name="columnChildrenStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')][{{arg2}}]//div[contains(@class, 'element-children')][contains(@style, '{{arg3}}')]" parameterized="true"/>
23+
<element name="columnByIndexAndWidthClass" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][contains(@class,'column-width-{{arg2}}')]" parameterized="true"/>
2324
<element name="displayLabel" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-column")])[{{arg1}}]/descendant::div[contains(@class, "pagebuilder-display-label")][contains(text(), "{{arg2}}")]' parameterized="true"/>
2425
<element name="columnMoveByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-column")])[{{arg1}}]//div[contains(@class,"pagebuilder-options-visible")]/descendant::*[@class="move-column"]' parameterized="true"/>
2526
<element name="displayLabelGridSize" type="button" selector='(//div[contains(@class, "pagebuilder-column-group")])[{{arg1}}]//div[contains(@class, "pagebuilder-display-label")][1][contains(text(), "/{{arg2}}")]' parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,18 @@
3737
<!-- Get 3/6 Column Width -->
3838
<comment userInput="Get 3/6 Column Width" stepKey="context1"/>
3939
<executeJS function="return document.querySelector('{{PageBuilderColumnSection.columnX('1')}}').clientWidth" stepKey="initalColumnWidth"/>
40+
<!-- Assert the initial width classes are correct -->
41+
<waitForElement selector="{{PageBuilderColumnSection.columnByIndexAndWidthClass('1','50')}}" stepKey="assertInitialWidthClass1"/>
42+
<waitForElement selector="{{PageBuilderColumnSection.columnByIndexAndWidthClass('2','50')}}" stepKey="assertInitialWidthClass2"/>
4043
<!-- Change Columns To 6:0 Ratio -->
4144
<comment userInput="Change Columns To 6:0 Ratio" stepKey="context2"/>
4245
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeSecondColumn">
4346
<argument name="contentType" value="PageBuilderColumnContentType"/>
4447
<argument name="contentTypeNumber" value="2"/>
4548
</actionGroup>
49+
<!-- Assert the width class changed to 100 correctly on the first column -->
50+
<waitForElement selector="{{PageBuilderColumnSection.columnByIndexAndWidthClass('1','100')}}" stepKey="assertWidthClass1"/>
51+
<!-- Add a new column -->
4652
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
4753
<argument name="contentType" value="PageBuilderDividerContentType"/>
4854
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -116,6 +122,9 @@
116122
<!-- Change Columns To 5:1 Ratio -->
117123
<comment userInput="Change Columns To 5:1 Ratio" stepKey="context1"/>
118124
<dragAndDrop selector1="{{PageBuilderColumnSection.columnX('1')}} {{PageBuilderColumnSection.columnResizeHandle}}" selector2="{{PageBuilderColumnSection.columnResizeGridLine('10')}}" x="$guideWidth" stepKey="dragColumnOneToFive"/>
125+
<!-- Assert the width classes are correct after manual resize -->
126+
<waitForElement selector="{{PageBuilderColumnSection.columnByIndexAndWidthClass('1','90')}}" stepKey="assertWidthClass1"/>
127+
<waitForElement selector="{{PageBuilderColumnSection.columnByIndexAndWidthClass('2','20')}}" stepKey="assertWidthClass2"/>
119128
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
120129
<argument name="contentType" value="PageBuilderDividerContentType"/>
121130
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

0 commit comments

Comments
 (0)