Skip to content

Commit bb8ccf4

Browse files
paras89paras89
committed
PB-500 re-adjust action groups, deprecate old ones and add new
1 parent dd98a99 commit bb8ccf4

28 files changed

+103
-38
lines changed

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="openGridSizeForm" deprecated="use openGridSizeInColumnGroup instead">
11+
<arguments>
12+
<argument name="index" defaultValue="1" type="string"/>
13+
</arguments>
14+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeButton(index)}}" stepKey="waitForGridSizeButtonVisible"/>
15+
<click selector="{{ColumnOnBackend.gridSizeButton(index)}}" stepKey="clickGridSizeButton"/>
16+
<waitForPageLoad stepKey="waitForAnimation"/>
17+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeInput(index)}}" stepKey="waitForGridVisible"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="updateGridSize" deprecated="use updateGridSizeInForm instead">
10+
<arguments>
11+
<argument name="index" defaultValue="1" type="string"/>
12+
<argument name="gridSize" defaultValue="12" type="string"/>
13+
</arguments>
14+
<waitForElementVisible selector="{{PageBuilderPanel.searchPanel}}" stepKey="waitForSearchPanelVisible"/>
15+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusColumnOptions"/>
16+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeButton(index)}}" stepKey="waitForGridSizeButtonVisible"/>
17+
<click selector="{{ColumnOnBackend.gridSizeButton(index)}}" stepKey="clickGridSizeButton"/>
18+
<waitForPageLoad stepKey="waitForAnimation"/>
19+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeInput(index)}}" stepKey="waitForGridVisible"/>
20+
<fillField selector="{{ColumnOnBackend.gridSizeInput(index)}}" userInput="{{gridSize}}" stepKey="enterGridSize"/>
21+
<pressKey selector="{{ColumnOnBackend.gridSizeInput(index)}}" parameterArray="['su',\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
22+
<waitForPageLoad stepKey="waitForUpdate"/>
23+
<waitForElementVisible selector="{{ColumnOnBackend.displayLabelGridSize(index, gridSize)}}" stepKey="validateGridSize"/>
24+
</actionGroup>
25+
</actionGroups>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="updateGridSizeInvalid" deprecated="use updateGridSizeInvalidInForm instead">
11+
<arguments>
12+
<argument name="index" defaultValue="1" type="string"/>
13+
<argument name="gridSize" defaultValue="12" type="string"/>
14+
<argument name="errorMessage"/>
15+
</arguments>
16+
<fillField selector="{{ColumnOnBackend.gridSizeInput(index)}}" userInput="{{gridSize}}" stepKey="enterGridSize"/>
17+
<click selector="{{ColumnOnBackend.columnX(index)}}" stepKey="clickColumn"/>
18+
<waitForPageLoad stepKey="waitForAnimation"/>
19+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeError(index, errorMessage)}}" stepKey="verifyError"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="openGridSizeForm">
10+
<actionGroup name="openGridSizeFormInColumnGroup">
1111
<arguments>
1212
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
1313
</arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeActionGroup.xml renamed to ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInFormActionGroup.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="updateGridSizeInForm">
1010
<arguments>
1111
<argument name="gridSize" type="string"/>
1212
<argument name="contentTypeIndex" defaultValue="1" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidActionGroup.xml renamed to ‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidInFormActionGroup.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="UpdateGridSizeInvalidInForm">
1111
<arguments>
1212
<argument name="gridSize" defaultValue="12" type="string"/>
1313
<argument name="errorMessage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CanAddColumnToSmallGridSizeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
3636
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
3737
</actionGroup>
38-
<actionGroup ref="updateGridSize" stepKey="updateGridSizeTo3">
38+
<actionGroup ref="updateGridSizeInForm" stepKey="updateGridSizeTo3">
3939
<argument name="gridSize" value="3"/>
4040
</actionGroup>
4141
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CannotAddColumnToFullSmallGridSizeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
3636
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
3737
</actionGroup>
38-
<actionGroup ref="updateGridSize" stepKey="updateGridSizeTo2">
38+
<actionGroup ref="updateGridSizeInForm" stepKey="updateGridSizeTo2">
3939
<argument name="gridSize" value="2"/>
4040
</actionGroup>
4141
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateColumnGridTooltipMessageTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
4040
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
4141
</actionGroup>
42-
<actionGroup ref="openGridSizeForm" stepKey="openGridSizeForm"/>
42+
<actionGroup ref="openGridSizeFormInColumnGroup" stepKey="openGridSizeForm"/>
4343
<click selector="{{ColumnOnBackend.gridSizeTooltip}}" stepKey="clickToolTip"/>
4444
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeTooltipWithMax}}" stepKey="verifyTooltip"/>
4545
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
4646
<argument name="containerTargetIndex" value="2"/>
4747
</actionGroup>
48-
<actionGroup ref="updateGridSize" stepKey="updateGridSize1">
48+
<actionGroup ref="updateGridSizeInForm" stepKey="updateGridSize1">
4949
<argument name="index" value="1"/>
5050
<argument name="gridSize" value="8"/>
5151
</actionGroup>

0 commit comments

Comments
 (0)