Skip to content

Commit 89d51c3

Browse files
committed
PB-500 maintain BC in MFTF tests
1 parent fbcdba5 commit 89d51c3

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@
3434
<element name="columnMoveByIndex" type="button" selector="(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), ' pagebuilder-column ')])[{{arg1}}]//div[contains(@class,&quot;pagebuilder-options-visible&quot;)]/descendant::*[@class=&quot;move-column&quot;]" parameterized="true"/>
3535
<element name="displayLabelGridSize" type="button" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]//div[contains(@class, &quot;pagebuilder-display-label&quot;)][1][contains(text(), &quot;/{{arg2}}&quot;)]" parameterized="true"/>
3636
<element name="gridSizeButton" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'indicator-wrapper')]" parameterized="true"/>
37-
<element name="gridSizeInput" type="input" selector="//input[@name='grid_size']"/>
38-
<element name="gridSizeTooltip" type="button" selector="//aside//*[@data-index='grid_size']/descendant::*[@name='grid_size']/ancestor::*[contains(@class,'admin__field-control')]/descendant::div[contains(@class,'admin__field-tooltip')]"/>
39-
<element name="gridSizeTooltipWithMax" type="button" selector="//aside//*[@data-index='grid_size']/descendant::*[@name='grid_size']/ancestor::*[contains(@class,'admin__field-control')]/descendant::div[contains(@class,'admin__field-tooltip-content')]//p[text()='Select a value between 2 and the value set in Maximum Column Grid Size setting in Content Management configuration.']"/>
37+
<element name="gridSizeInputInForm" type="input" selector="//input[@name='grid_size']"/>
38+
<element name="gridSizeTooltipInForm" type="button" selector="//aside//*[@data-index='grid_size']/descendant::*[@name='grid_size']/ancestor::*[contains(@class,'admin__field-control')]/descendant::div[contains(@class,'admin__field-tooltip')]"/>
39+
<element name="gridSizeTooltipWithMaxInForm" type="button" selector="//aside//*[@data-index='grid_size']/descendant::*[@name='grid_size']/ancestor::*[contains(@class,'admin__field-control')]/descendant::div[contains(@class,'admin__field-tooltip-content')]//p[text()='Select a value between 2 and the value set in Maximum Column Grid Size setting in Content Management configuration.']"/>
40+
<element name="gridSizeInput" type="input" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'grid-panel-item-wrapper')]/input" parameterized="true" deprecated="Use gridSizeInputInForm instead. Grid Size moved to Column Group form"/>
41+
<element name="gridSizeTooltip" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'grid-panel-tooltip')][1]" parameterized="true" deprecated="Use gridSizeTooltipInForm instead. Grid Size moved to Column Group form"/>
42+
<element name="gridSizeTooltipWithMax" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'grid-panel-tooltip')][1]//span//p//span[text()='{{arg2}}']" parameterized="true" deprecated="Use gridSizeTooltipWithMaxInForm instead. Grid Size moved to Column Group form"/>
4043
<element name="gridSizeError" type="button" selector="(//label[contains(@class, 'admin__field-error') and contains(text(), '{{arg1}}')])" parameterized="true"/>
4144
<element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
4245
<element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true" deprecated="Styles are not inline"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
4141
</actionGroup>
4242
<actionGroup ref="openGridSizeFormInColumnGroup" stepKey="openGridSizeForm"/>
43-
<click selector="{{ColumnOnBackend.gridSizeTooltip}}" stepKey="clickToolTip"/>
44-
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeTooltipWithMax}}" stepKey="verifyTooltip"/>
43+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickWithinPanel"/>
44+
<click selector="{{ColumnOnBackend.gridSizeTooltipInForm}}" stepKey="clickToolTip"/>
45+
<waitForElementVisible selector="{{ColumnOnBackend.gridSizeTooltipWithMaxInForm}}" stepKey="verifyTooltip"/>
4546
</test>
4647
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
5151
<comment userInput="Validate default grid size after save" stepKey="commentValidateAfterSave"/>
5252
<actionGroup ref="openGridSizeFormInColumnGroup" stepKey="openGridSizeFormAfterSave"/>
53-
<seeInField selector="{{ColumnOnBackend.gridSizeInput}}" userInput="{{PageBuilderGridSize.defaultGridSize}}" stepKey="seeDefaultGridSizeAfterSave"/>
53+
<seeInField selector="{{ColumnOnBackend.gridSizeInputInForm}}" userInput="{{PageBuilderGridSize.defaultGridSize}}" stepKey="seeDefaultGridSizeAfterSave"/>
5454
</test>
5555
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCanInteractEditPanelTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<after>
3333
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3434
</after>
35+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="dragColumnIntoStage"/>
3536
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnGroupIntoStage">
3637
<argument name="contentType" value="PageBuilderColumnGroupContentType"/>
3738
</actionGroup>

0 commit comments

Comments
 (0)