Skip to content

Commit 2c07e95

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch '559_no-predefined-gutters' of github.com:bluemwhitew/magento2-page-builder into PR-bundle
 Conflicts: app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml
2 parents d865397 + 751953c commit 2c07e95

File tree

176 files changed

+1251
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+1251
-645
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginFieldsSlideOutPanelActionGroup.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="seeInMarginFieldsSlideOutPanel">
10+
<annotations>
11+
<description>Validates margin field contents.</description>
12+
</annotations>
1113
<arguments>
1214
<argument name="property" defaultValue=""/>
1315
</arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInPaddingFieldsSlideOutPanelActionGroup.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="seeInPaddingFieldsSlideOutPanel">
10+
<annotations>
11+
<description>Validates padding field contents.</description>
12+
</annotations>
1113
<arguments>
1214
<argument name="property" defaultValue=""/>
1315
</arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationAllOptionsActionGroup.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,21 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="ValidateAdvancedConfigurationAllOptionsActionGroup">
1110
<annotations>
12-
<description value="Validates styles from Advanced configuration in content type settings"/>
11+
<description>Validates styles from Advanced Configuration in content type settings.</description>
1312
</annotations>
1413
<arguments>
1514
<argument name="page" defaultValue=""/>
1615
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
1716
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
1817
<argument name="borderColor" defaultValue=""/>
19-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
20-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
18+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
2120
<argument name="cssClasses" defaultValue=""/>
22-
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
23-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
21+
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
22+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
2423
<argument name="index" defaultValue="1" type="string"/>
2524
</arguments>
2625
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<arguments>
1515
<argument name="page" defaultValue=""/>
1616
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
17-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
17+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
1818
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1919
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart"/>
2020
<argument name="defaultMargin" defaultValue="0" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentActionGroup.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
1110
<annotations>
12-
<description value="Validate Advanced Configuration without Alignment, Css classes and Border"/>
11+
<description>Validate Advanced Configuration without Alignment, CSS Classes and Border</description>
1312
</annotations>
1413
<arguments>
1514
<argument name="page" defaultValue=""/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="updateGridSize">
1110
<arguments>
1211
<argument name="index" defaultValue="1" type="string"/>
1312
<argument name="gridSize" defaultValue="12" type="string"/>
1413
</arguments>
14+
<waitForElementVisible selector="{{PageBuilderPanel.searchPanel}}" stepKey="waitForSearchPanelVisible"/>
15+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusColumnOptions"/>
1516
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeButton(index)}}" stepKey="waitForGridSizeButtonVisible"/>
1617
<click selector="{{ColumnOnBackend.gridSizeButton(index)}}" stepKey="clickGridSizeButton"/>
1718
<waitForPageLoad stepKey="waitForAnimation"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="validateColumnAppearanceBottomAligned" extends="validateColumnAppearanceTopAligned">
1110
<comment userInput="validateColumnAppearanceBottomAligned" stepKey="comment"/>
1211
<seeElement selector="{{section.appearance(columnIndex, PageBuilderColumnAppearanceProperty_Bottom.value)}}" stepKey="seeColumnAppearance"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<comment userInput="validateColumnAppearanceCenterAligned" stepKey="comment"/>
1212
<seeElement selector="{{section.appearance(columnIndex, PageBuilderColumnAppearanceProperty_Center.value)}}" stepKey="seeColumnAppearance"/>
1313
<executeJS function="return Math.round(document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].getBoundingClientRect().top + (document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].clientHeight / 2))" stepKey="topOfColumnGroup"/>
14-
<executeJS function="return Math.round(document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].getBoundingClientRect().top + (document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].clientHeight / 2))" stepKey="topOfIndividualColumn"/>
14+
<executeJS function="return Math.round(document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].getBoundingClientRect().top + (document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].clientHeight / 2) + ({{affordanceValue}}/2))" stepKey="topOfIndividualColumn"/>
1515
</actionGroup>
1616
</actionGroups>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
<argument name="columnIndex" defaultValue="1" type="string"/>
1414
<argument name="columnGroupIndex" defaultValue="1" type="string"/>
1515
<argument name="acceptableOffset" defaultValue="2" type="string"/>
16+
<argument name="affordanceValue" defaultValue="0" type="string"/>
1617
</arguments>
1718
<comment userInput="validateColumnAppearanceFullHeight" stepKey="comment"/>
1819
<waitForElementVisible selector="{{section.columnGroup(columnGroupIndex)}}" stepKey="waitForColumnGroup"/>
1920
<waitForElementVisible selector="{{section.base(columnIndex)}}" stepKey="waitForColumn"/>
2021
<seeElement selector="{{section.appearance(columnIndex, PageBuilderColumnAppearanceProperty_FullHeight.value)}}" stepKey="seeColumnAppearance"/>
21-
<executeJS function="return document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].clientHeight" stepKey="columnGroupHeight"/>
22+
<executeJS function="return document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].clientHeight - {{affordanceValue}}" stepKey="columnGroupHeight"/>
2223
<executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].clientHeight" stepKey="individualColumnHeight"/>
2324
<executeJS function="return Math.round(Math.abs({$columnGroupHeight}-{$individualColumnHeight}))" stepKey="heightDifference"/>
2425
<assertLessThan stepKey="assertColumnHeightEqualToColumnGroupHeight">

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,33 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="validateColumnAppearanceTopAligned">
1110
<arguments>
1211
<argument name="section" defaultValue="ColumnOnBackend"/>
1312
<argument name="height" defaultValue="PageBuilderMinHeightProperty_300"/>
1413
<argument name="columnIndex" defaultValue="1" type="string"/>
1514
<argument name="columnGroupIndex" defaultValue="1" type="string"/>
1615
<argument name="acceptableOffset" defaultValue="2" type="string"/>
16+
<argument name="affordanceValue" defaultValue="0" type="string"/>
1717
</arguments>
1818
<comment userInput="validateColumnAppearanceTopAligned" stepKey="comment"/>
1919
<waitForElementVisible selector="{{section.columnGroup(columnGroupIndex)}}" stepKey="waitForColumnGroup"/>
2020
<waitForElementVisible selector="{{section.base(columnIndex)}}" stepKey="waitForColumn"/>
2121
<seeElement selector="{{section.appearance(columnIndex, PageBuilderColumnAppearanceProperty_Top.value)}}" stepKey="seeColumnAppearance"/>
22-
<executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].clientHeight" stepKey="individualColumnHeight"/>
22+
<executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].clientHeight + {{affordanceValue}}" stepKey="individualColumnHeight"/>
2323
<executeJS function="return Math.round(Math.abs({$individualColumnHeight}-{{height.value}}))" stepKey="heightDifference"/>
24-
<!-- Validate height of column -->
24+
25+
<!-- Validate Height of Column -->
2526
<assertLessThanOrEqual stepKey="assertContentHeightAcceptable">
2627
<expectedResult type="int">{{acceptableOffset}}</expectedResult>
2728
<actualResult type="variable">heightDifference</actualResult>
2829
</assertLessThanOrEqual>
2930
<executeJS function="return document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].getBoundingClientRect().top" stepKey="topOfColumnGroup"/>
3031
<executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].getBoundingClientRect().top" stepKey="topOfIndividualColumn"/>
3132
<executeJS function="return Math.round(Math.abs({$topOfColumnGroup}-{$topOfIndividualColumn}))" stepKey="topOfColumnDifference"/>
32-
<!-- Validate position of column -->
33+
34+
<!-- Validate Position of Column -->
3335
<assertLessThan stepKey="assertTopOfColumnAcceptable">
3436
<expectedResult type="int">{{acceptableOffset}}</expectedResult>
3537
<actualResult type="variable">topOfColumnDifference</actualResult>

0 commit comments

Comments
 (0)