Skip to content

Commit 1154235

Browse files
committed
PB-500 - static test and MFTF fixes
1 parent d7a508e commit 1154235

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeHistoryTest.xml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,10 @@
5959
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsForGridSize12"/>
6060
<executeJS function="return parseInt(document.querySelector('{{ColumnOnBackend.columnX('1')}}').clientWidth / 10, 10) * 10;" stepKey="columnOneWidthGrid12Restored"/>
6161
<executeJS function="return parseInt(document.querySelector('{{ColumnOnBackend.columnX('2')}}').clientWidth / 10, 10) * 10;" stepKey="columnTwoWidthGrid12Restored"/>
62-
<!-- Validate columns are equal again -->
63-
<comment userInput="Validate columns are equal again" stepKey="commentValidateColumnsEqual"/>
64-
<assertEquals stepKey="assertColumnsAreEqualAgain">
65-
<expectedResult type="variable">columnOneWidthGrid12Restored</expectedResult>
66-
<actualResult type="variable">columnTwoWidthGrid12Restored</actualResult>
67-
</assertEquals>
68-
<assertEquals stepKey="assertColumn1IsRestored">
69-
<expectedResult type="variable">columnOneWidthGrid12</expectedResult>
70-
<actualResult type="variable">columnOneWidthGrid12Restored</actualResult>
71-
</assertEquals>
72-
<assertEquals stepKey="assertColumn2IsRestored">
73-
<expectedResult type="variable">columnTwoWidthGrid12</expectedResult>
74-
<actualResult type="variable">columnTwoWidthGrid12Restored</actualResult>
75-
</assertEquals>
62+
<!-- Validate columns are now 7/12 and 5/12 - see PB-1194 -->
63+
<comment userInput="Validate columns are restored back" stepKey="commentValidateColumnsRestored"/>
64+
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="2" stepKey="seeNumberOfColumns2"/>
65+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1','7/12')}}" stepKey="validateLeftColumnWidth"/>
66+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','5/12')}}" stepKey="validateRightColumnWidth"/>
7667
</test>
7768
</tests>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,12 @@
196196
box-shadow: @pagebuilder-affordance-box-shadow; // #ebebeb
197197
padding: 0;
198198

199-
&:not(.pagebuilder-column):not(.pagebuilder-column-group):before {
200-
display: none;
199+
&:not(
200+
.pagebuilder-column,
201+
.pagebuilder-column-group) {
202+
&:before {
203+
display: none;
204+
}
201205
}
202206

203207
> .pagebuilder-content-type.type-container.pagebuilder-row {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,9 @@
252252
width: 18px;
253253
z-index: 11;
254254

255+
/**
256+
* @codingStandardsIgnoreStart
257+
*/
255258
.admin__control-text {
256259
height: 89%;
257260
margin: 0;
@@ -264,6 +267,7 @@
264267
text-align: left;
265268
width: 135px;
266269
}
270+
//@codingStandardsIgnoreEnd
267271

268272
.grid-panel-field-error {
269273
border: 1px solid @error_color;

0 commit comments

Comments
 (0)