Skip to content

Commit 7fc8642

Browse files
glo71317glo71317
committed
Merge remote-tracking branch 'origin/develop' into release_sync
2 parents 20139ba + c966417 commit 7fc8642

File tree

181 files changed

+2761
-848
lines changed

Some content is hidden

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

181 files changed

+2761
-848
lines changed

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="dragColumnToColumnGroup">
11+
<arguments>
12+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
13+
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
14+
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
15+
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
16+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
17+
</arguments>
18+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
19+
<waitForElementVisible time="30" selector="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel('Columns')}}" stepKey="waitForContentTypeInPanel"/>
20+
<dragAndDrop selector1="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel('Columns')}}" selector2="{{PageBuilderStage.contentTypeContainer('column', containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
21+
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
22+
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
23+
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex('column', contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/>
24+
<waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
25+
</actionGroup>
26+
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="openGridSizeForm">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="openGridSizeForm" deprecated="use openGridSizeInColumnGroup instead">
1111
<arguments>
1212
<argument name="index" defaultValue="1" type="string"/>
1313
</arguments>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9-
<actionGroup name="updateGridSize">
9+
<actionGroup name="updateGridSize" deprecated="use updateGridSizeInForm instead">
1010
<arguments>
1111
<argument name="index" defaultValue="1" type="string"/>
1212
<argument name="gridSize" defaultValue="12" type="string"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="updateGridSizeInvalid">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="updateGridSizeInvalid" deprecated="use updateGridSizeInvalidInForm instead">
1111
<arguments>
1212
<argument name="index" defaultValue="1" type="string"/>
1313
<argument name="gridSize" defaultValue="12" type="string"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</assertLessThanOrEqual>
3030
<executeJS function="return document.querySelectorAll('{{section.allColumnGroups}}')[{{columnGroupIndex}}-1].getBoundingClientRect().top" stepKey="topOfColumnGroup"/>
3131
<executeJS function="return document.querySelectorAll('{{section.baseCSS}}')[{{columnIndex}}-1].getBoundingClientRect().top" stepKey="topOfIndividualColumn"/>
32-
<executeJS function="return Math.round(Math.abs({$topOfColumnGroup}-{$topOfIndividualColumn}))" stepKey="topOfColumnDifference"/>
32+
<executeJS function="return Math.round(Math.abs({$topOfColumnGroup}-{$topOfIndividualColumn}) - 15)" stepKey="topOfColumnDifference"/>
3333

3434
<!-- Validate Position of Column -->
3535
<assertLessThan stepKey="assertTopOfColumnAcceptable">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<argument name="section" defaultValue="ColumnOnBackend"/>
1818
</arguments>
1919
<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"/>
20+
<executeJS function="return Math.round((window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) - 30)* {{columnWidth}})" stepKey="grabCalculatedColumnWidthValue"/>
2121
<executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
2222
<assertLessThanOrEqual stepKey="assertColumnWidthValue">
2323
<expectedResult type="int">2</expectedResult>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="ValidateColumnWidthOnFrontendActionGroup">
10+
<annotations>
11+
<description>Validates that Column Width is calculated properly</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="index" type="string" defaultValue="1"/>
15+
<argument name="parentIndex" type="string" defaultValue="1"/>
16+
<argument name="columnWidth" type="string" defaultValue="{{PageBuilderColumnStyles.widthHalf}}"/>
17+
<argument name="section" defaultValue="ColumnOnFrontend"/>
18+
</arguments>
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"/>
21+
<executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
22+
<assertLessThanOrEqual stepKey="assertColumnWidthValue">
23+
<expectedResult type="int">2</expectedResult>
24+
<actualResult type="variable">columnWidthDifference</actualResult>
25+
</assertLessThanOrEqual>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/OpenGridSizeFormInColumnGroupActionGroup.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="openGridSizeFormInColumnGroup">
11+
<arguments>
12+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
13+
</arguments>
14+
<executeJS function="return '//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(.,&quot;COLUMNS&quot;)]';" stepKey="contentTypeLabelSelector" />
15+
<executeJS function="return '(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(&quot; &quot;, @class, &quot; &quot;), &quot; pagebuilder-affordance-column-group &quot;)])[{{contentTypeIndex}}]';" stepKey="contentTypeByIndexSelector" />
16+
<waitForElementVisible time="20" selector="{$contentTypeByIndexSelector}{$contentTypeLabelSelector}" stepKey="waitForContentTypeInStageVisible"/>
17+
<moveMouseOver stepKey="moveMouseOverSearch" selector="{{PageBuilderPanel.searchPanel}}" />
18+
<moveMouseOver selector="{$contentTypeByIndexSelector}{$contentTypeLabelSelector}" stepKey="onMouseOverContentTypeStage"/>
19+
<waitForPageLoad stepKey="waitForPageLoad"/>
20+
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex('column-group', contentTypeIndex)}}" stepKey="waitForOptions"/>
21+
<waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeEditByIndex('column-group', contentTypeIndex)}}" stepKey="waitForEditButton"/>
22+
<click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeEditByIndex('column-group', contentTypeIndex)}}" stepKey="clickEditContentType"/>
23+
<waitForPageLoad stepKey="waitForAnimation1" time="30"/>
24+
<waitForElementVisible selector="{{EditPanelForm.editForm}}" stepKey="waitForEditForm"/>
25+
<see userInput="Edit Columns" selector="{{EditPanelForm.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
26+
<waitForPageLoad stepKey="waitForAnimation2" time="30"/>
27+
<see userInput="Grid Size" selector="{{EditPanelForm.panelFieldLabel('general', 'grid_size', 'general', 'grid_size')}}" stepKey="seePropertyLabel"/>
28+
</actionGroup>
29+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInFormActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="updateGridSizeInForm">
10+
<arguments>
11+
<argument name="gridSize" type="string"/>
12+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
13+
</arguments>
14+
<executeJS function="return '//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(.,&quot;COLUMNS&quot;)]';" stepKey="contentTypeLabelSelector" />
15+
<executeJS function="return '(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(&quot; &quot;, @class, &quot; &quot;), &quot; pagebuilder-affordance-column-group &quot;)])[{{contentTypeIndex}}]';" stepKey="contentTypeByIndexSelector" />
16+
<waitForElementVisible time="20" selector="{$contentTypeByIndexSelector}{$contentTypeLabelSelector}" stepKey="waitForContentTypeInStageVisible"/>
17+
<moveMouseOver stepKey="moveMouseOverSearch" selector="{{PageBuilderPanel.searchPanel}}" />
18+
<moveMouseOver selector="{$contentTypeByIndexSelector}{$contentTypeLabelSelector}" stepKey="onMouseOverContentTypeStage"/>
19+
<waitForPageLoad stepKey="waitForPageLoad"/>
20+
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex('column-group', contentTypeIndex)}}" stepKey="waitForOptions"/>
21+
<waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeEditByIndex('column-group', contentTypeIndex)}}" stepKey="waitForEditButton"/>
22+
<click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeEditByIndex('column-group', contentTypeIndex)}}" stepKey="clickEditContentType"/>
23+
<waitForPageLoad stepKey="waitForAnimation1" time="30"/>
24+
<waitForElementVisible selector="{{EditPanelForm.editForm}}" stepKey="waitForEditForm"/>
25+
<see userInput="Edit Columns" selector="{{EditPanelForm.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
26+
<waitForPageLoad stepKey="waitForAnimation2" time="30"/>
27+
<see userInput="Grid Size" selector="{{EditPanelForm.panelFieldLabel('general', 'grid_size', 'general', 'grid_size')}}" stepKey="seePropertyLabel"/>
28+
<fillField selector="{{EditPanelForm.panelFieldControl('general', 'grid_size')}}" userInput="{{gridSize}}" stepKey="fillPropertyField"/>
29+
<click selector="{{EditPanelForm.panelFieldLabel('general', 'grid_size', 'general', 'grid_size')}}" stepKey="clickOnFieldLabel"/>
30+
</actionGroup>
31+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidInFormActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="updateGridSizeInvalidInForm">
11+
<arguments>
12+
<argument name="gridSize" defaultValue="12" type="string"/>
13+
<argument name="errorMessage"/>
14+
</arguments>
15+
<see userInput="Grid Size" selector="{{EditPanelForm.panelFieldLabel('general', 'grid_size', 'general', 'grid_size')}}" stepKey="seePropertyLabel"/>
16+
<fillField selector="{{EditPanelForm.panelFieldControl('general', 'grid_size')}}" userInput="{{gridSize}}" stepKey="enterGridSize"/>
17+
<click selector="{{EditPanelForm.panelFieldLabel('general', 'grid_size', 'general', 'grid_size')}}" stepKey="clickOnFieldLabel"/>
18+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeError(errorMessage)}}" stepKey="verifyError"/>
19+
</actionGroup>
20+
</actionGroups>

0 commit comments

Comments
 (0)