Skip to content

Commit 07fce5c

Browse files
petrovsapetrovsa
committed
Merge remote-tracking branch 'origin/558_7_content-type-style-attribute-removal' into 558_7_content-type-style-attribute-removal
2 parents 8c8739d + c5327f6 commit 07fce5c

File tree

6 files changed

+18
-72
lines changed

6 files changed

+18
-72
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<arguments>
1414
<argument name="index" type="string" defaultValue="1"/>
1515
<argument name="parentIndex" type="string" defaultValue="1"/>
16-
<argument name="columnWidth" defaultValue="PageBuilderColumnWidthHalf"/>
16+
<argument name="columnWidth" type="string" defaultValue="{{PageBuilderColumnStyles.widthHalf}}"/>
17+
<argument name="section" defaultValue="ColumnOnBackend"/>
1718
</arguments>
18-
<executeJS function="return Math.round(window.getComputedStyle(document.evaluate('{{ColumnOnBackend.columnConfigurationPath(index)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;))" stepKey="grabColumnWidthValue"/>
19-
<executeJS function="return Math.round(window.getComputedStyle(document.evaluate('{{ColumnOnBackend.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) * {{columnWidth.floatValue}})" stepKey="grabCalculatedColumnWidthValue"/>
19+
<executeJS function="return Math.round(window.getComputedStyle(document.evaluate('{{section.columnConfigurationPath(index)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;))" stepKey="grabColumnWidthValue"/>
20+
<executeJS function="return Math.round(window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) * {{columnWidth}})" stepKey="grabCalculatedColumnWidthValue"/>
2021
<assertEquals stepKey="assertColumnWidthValue">
2122
<expectedResult type="variable">grabColumnWidthValue</expectedResult>
2223
<actualResult type="variable">grabCalculatedColumnWidthValue</actualResult>

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -115,32 +115,6 @@
115115
<data key="fieldName">background_attachment</data>
116116
<data key="value">Fixed</data>
117117
</entity>
118-
<!-- Column Width -->
119-
<entity name="PageBuilderColumnWidthHalf" type="pagebuilder_column_width_property">
120-
<data key="name">widthHalf</data>
121-
<data key="value">50%</data>
122-
<data key="floatValue">0.5</data>
123-
</entity>
124-
<entity name="PageBuilderColumnWidthOneTwelfth" type="pagebuilder_column_width_property">
125-
<data key="name">widthOneTwelfth</data>
126-
<data key="value">8.33333%</data>
127-
<data key="floatValue">0.0833333</data>
128-
</entity>
129-
<entity name="PageBuilderColumnWidthOneSixth" type="pagebuilder_column_width_property">
130-
<data key="name">widthOneSixth</data>
131-
<data key="value">16.6667%</data>
132-
<data key="floatValue">0.166667</data>
133-
</entity>
134-
<entity name="PageBuilderColumnWidthOneThird" type="pagebuilder_column_width_property">
135-
<data key="name">widthOneSixth</data>
136-
<data key="value">33.3333%</data>
137-
<data key="floatValue">0.333333</data>
138-
</entity>
139-
<entity name="PageBuilderColumnWidthFiveTwelfth" type="pagebuilder_column_width_property">
140-
<data key="name">widthOneSixth</data>
141-
<data key="value">41.6667%</data>
142-
<data key="floatValue">0.416667</data>
143-
</entity>
144118
<!-- Column Styles -->
145119
<entity name="PageBuilderColumnStyles" type="pagebuilder_column_styles">
146120
<data key="alignmentTop">flex-start</data>
@@ -160,11 +134,11 @@
160134
<data key="minHeight300">300</data>
161135
<data key="padding">5</data>
162136
<data key="textAlignment">center</data>
163-
<data key="widthOneTwelfth">width: 8.33333%</data>
164-
<data key="widthOneSixth">width: 16.6667%</data>
165-
<data key="widthOneThird">width: 33.3333%</data>
166-
<data key="widthFiveTwelfth">width: 41.6667%</data>
167-
<data key="widthHalf">width: 50%</data>
137+
<data key="widthOneTwelfth">0.0833333</data>
138+
<data key="widthOneSixth">0.166667</data>
139+
<data key="widthOneThird">0.333333</data>
140+
<data key="widthFiveTwelfth">0.416667</data>
141+
<data key="widthHalf">0.5</data>
168142
</entity>
169143
<!-- Grid Size -->
170144
<entity name="PageBuilderGridSize" type="pagebuilder_grid_size">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="allColumns" type="block" selector="(//div[@data-content-type='column'])"/>
1717
<element name="columnX" type="block" selector="[data-content-type=column]:nth-child({{arg1}})" parameterized="true"/>
1818
<element name="columnConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
19-
<element name="columnGroupConfigurationPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]" parameterized="true"/>
19+
<element name="columnGroupPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]" parameterized="true"/>
2020
<element name="columnStyle" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style, '{{arg2}}')]" parameterized="true" deprecated="Styles are not inline"/>
2121
<element name="column1Height" type="button" selector="(//div[@data-content-type='column'])[1][contains(@style, 'min-height: 500px;')]" deprecated="Styles are not inline"/>
2222
<element name="column1HeightFull" type="button" selector="(//div[@data-content-type='column'])[1][contains(@style, 'align-self: stretch;')]" deprecated="Styles are not inline"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemovingColumnDistributesWidthTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,25 @@
4040
<argument name="contentTypeIndex" value="3"/>
4141
</actionGroup>
4242
<actionGroup ref="ValidateColumnWidthActionGroup" stepKey="seeFirstColumnWidth">
43-
<argument name="columnWidth" value="PageBuilderColumnWidthOneTwelfth"/>
43+
<argument name="columnWidth" value="{{PageBuilderColumnStyles.widthOneTwelfth}}"/>
4444
</actionGroup>
4545
<actionGroup ref="ValidateColumnWidthActionGroup" stepKey="seeSecondColumnWidth">
4646
<argument name="index" value="2"/>
47-
<argument name="columnWidth" value="PageBuilderColumnWidthFiveTwelfth"/>
47+
<argument name="columnWidth" value="{{PageBuilderColumnStyles.widthFiveTwelfth}}"/>
4848
</actionGroup>
4949
<actionGroup ref="ValidateColumnWidthActionGroup" stepKey="seeThirdColumnWidth">
5050
<argument name="index" value="3"/>
51-
<argument name="columnWidth" value="PageBuilderColumnWidthHalf"/>
51+
<argument name="columnWidth" value="{{PageBuilderColumnStyles.widthHalf}}"/>
5252
</actionGroup>
5353
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeColumn1">
5454
<argument name="contentType" value="PageBuilderColumnContentType"/>
5555
</actionGroup>
5656
<actionGroup ref="ValidateColumnWidthActionGroup" stepKey="seeFirstColumnWidthDistributed">
57-
<argument name="columnWidth" value="PageBuilderColumnWidthHalf"/>
57+
<argument name="columnWidth" value="{{PageBuilderColumnStyles.widthHalf}}"/>
5858
</actionGroup>
5959
<actionGroup ref="ValidateColumnWidthActionGroup" stepKey="seeSecondColumnWidthDistributed">
6060
<argument name="index" value="2"/>
61-
<argument name="columnWidth" value="PageBuilderColumnWidthHalf"/>
61+
<argument name="columnWidth" value="{{PageBuilderColumnStyles.widthHalf}}"/>
6262
</actionGroup>
6363
</test>
6464
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddColumnToTabTest.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,9 @@
8383
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
8484
<argument name="cssProperty" value="backgroundColor"/>
8585
</actionGroup>
86-
<actionGroup ref="ValidateContentTypeForCalculatedStyles" stepKey="seeColumn2DefaultWidthApplied">
87-
<argument name="selector" value="{{ColumnOnFrontend.base('2')}}"/>
88-
<argument name="wrapperSelector" value="{{ColumnOnFrontend.columnGroupConfigurationPath('1')}}"/>
89-
<argument name="expectedProperty" value="50%"/>
90-
<argument name="cssProperty" value="width"/>
86+
<actionGroup ref="ValidateColumnWidthActionGroup" stepKey="seeFirstColumnWidthDistributed">
87+
<argument name="index" value="2"/>
88+
<argument name="section" value="ColumnOnFrontend"/>
9189
</actionGroup>
9290
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeColumn2HeightApplied">
9391
<argument name="selector" value="{{ColumnOnFrontend.base('2')}}"/>

0 commit comments

Comments
 (0)