Skip to content

Commit c31ad59

Browse files
author
Hwashiang Yu
committed
MC-4153: Column Content Type doesn't apply configuration of CSS Classes
- Updated column selectors and sections
1 parent a90d6bd commit c31ad59

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<element name="gridSizeTooltip" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'grid-panel-tooltip')][1]" parameterized="true"/>
3232
<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"/>
3333
<element name="gridSizeError" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'admin__field-error') and contains(text(), '{{arg2}}')]" parameterized="true"/>
34-
<element name="textAlign" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'text-align: {{arg2}};')][{{arg3}}]" parameterized="true"/>
35-
<element name="borderStyle" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'border-style: {{arg2}};')][{{arg3}}]" parameterized="true"/>
36-
<element name="borderColor" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'border-color: {{arg2}};')][{{arg3}}]" parameterized="true"/>
37-
<element name="borderWidth" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'border-width: {{arg2}}px;')][{{arg3}}]" parameterized="true"/>
38-
<element name="borderRadius" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'border-radius: {{arg2}}px;')][{{arg3}}]" parameterized="true"/>
39-
<element name="margin" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'margin: {{arg2}}px;')][{{arg3}}]" parameterized="true"/>
40-
<element name="padding" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'padding: {{arg2}}px;')][{{arg3}}]" parameterized="true"/>
41-
<element name="classes" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@class, '{{arg2}}')][{{arg3}}]" parameterized="true"/>
34+
<element name="alignment" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'text-align: {{arg3}};')]" parameterized="true"/>
35+
<element name="border" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'border-style: {{arg3}};')]" parameterized="true"/>
36+
<element name="borderColor" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'border-color: {{arg3}};')]" parameterized="true"/>
37+
<element name="borderWidth" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'border-width: {{arg3}}px;')]" parameterized="true"/>
38+
<element name="borderRadius" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'border-radius: {{arg3}}px;')]" parameterized="true"/>
39+
<element name="margins" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'margin: {{arg3}}px;')]" parameterized="true"/>
40+
<element name="padding" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'padding: {{arg3}}px;')]" parameterized="true"/>
41+
<element name="cssClasses" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@class, '{{arg3}}')]" parameterized="true"/>
4242
<!-- Background Configuration -->
4343
<element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
4444
<element name="backgroundSize" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,26 +1037,26 @@
10371037
<!-- Validate Stage -->
10381038
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
10391039
<waitForElementVisible time="2" selector="{{ColumnOnBackend.column}}" stepKey="waitForBackEndColumn"/>
1040-
<seeElement selector="{{ColumnOnBackend.textAlign('1', PageBuilderAdvancedAlignmentPropertyLeft.value, '1')}}" stepKey="seetextAlignStyleOnStage"/>
1041-
<seeElement selector="{{ColumnOnBackend.borderStyle('1', PageBuilderAdvancedBorderPropertyDotted.value, '1')}}" stepKey="seeColumnBorderStyleOnStage"/>
1042-
<seeElement selector="{{ColumnOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_ffffff.rgb, '1')}}" stepKey="seeColumnBorderColorOnStage"/>
1043-
<seeElement selector="{{ColumnOnBackend.borderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value, '1')}}" stepKey="seeColumnBorderWidthOnStage"/>
1044-
<seeElement selector="{{ColumnOnBackend.borderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value, '1')}}" stepKey="seeColumnBorderRadiusStyleOnStage"/>
1045-
<seeElement selector="{{ColumnOnBackend.margin('1', PageBuilderAdvancedMarginsAndPaddingProperty.value, '1')}}" stepKey="seeColumnMarginStyleOnStage"/>
1046-
<seeElement selector="{{ColumnOnBackend.padding('1', PageBuilderAdvancedMarginsAndPaddingProperty.value, '1')}}" stepKey="seeColumnPaddingStyleOnStage"/>
1047-
<seeElement selector="{{ColumnOnBackend.classes('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value, '1')}}" stepKey="seeColumnClassOnStage"/>
1040+
<seeElement selector="{{ColumnOnBackend.alignment('1', '1', PageBuilderAdvancedAlignmentPropertyLeft.value)}}" stepKey="seetextAlignStyleOnStage"/>
1041+
<seeElement selector="{{ColumnOnBackend.border('1', '1', PageBuilderAdvancedBorderPropertyDotted.value)}}" stepKey="seeColumnBorderStyleOnStage"/>
1042+
<seeElement selector="{{ColumnOnBackend.borderColor('1', '1', PageBuilderAdvancedBorderColorProperty_ffffff.rgb)}}" stepKey="seeColumnBorderColorOnStage"/>
1043+
<seeElement selector="{{ColumnOnBackend.borderWidth('1', '1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeColumnBorderWidthOnStage"/>
1044+
<seeElement selector="{{ColumnOnBackend.borderRadius('1', '1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeColumnBorderRadiusStyleOnStage"/>
1045+
<seeElement selector="{{ColumnOnBackend.margins('1', '1', PageBuilderAdvancedMarginsAndPaddingProperty.value)}}" stepKey="seeColumnMarginStyleOnStage"/>
1046+
<seeElement selector="{{ColumnOnBackend.padding('1', '1', PageBuilderAdvancedMarginsAndPaddingProperty.value)}}" stepKey="seeColumnPaddingStyleOnStage"/>
1047+
<seeElement selector="{{ColumnOnBackend.cssClasses('1', '1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeColumnClassOnStage"/>
10481048
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
10491049
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
10501050
<!-- Validate Stage After Save -->
10511051
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1052-
<seeElement selector="{{ColumnOnBackend.textAlign('1', PageBuilderAdvancedAlignmentPropertyLeft.value, '1')}}" stepKey="seetextAlignStyleOnStageAfterSave"/>
1053-
<seeElement selector="{{ColumnOnBackend.borderStyle('1', PageBuilderAdvancedBorderPropertyDotted.value, '1')}}" stepKey="seeColumnBorderStyleOnStageAfterSave"/>
1054-
<seeElement selector="{{ColumnOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_ffffff.rgb, '1')}}" stepKey="seeColumnBorderColorOnStageAfterSave"/>
1055-
<seeElement selector="{{ColumnOnBackend.borderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value, '1')}}" stepKey="seeColumnBorderWidthOnStageAfterSave"/>
1056-
<seeElement selector="{{ColumnOnBackend.borderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value, '1')}}" stepKey="seeColumnBorderRadiusStyleOnStageAfterSave"/>
1057-
<seeElement selector="{{ColumnOnBackend.margin('1', PageBuilderAdvancedMarginsAndPaddingProperty.value, '1')}}" stepKey="seeColumnMarginStyleOnStageAfterSave"/>
1058-
<seeElement selector="{{ColumnOnBackend.padding('1', PageBuilderAdvancedMarginsAndPaddingProperty.value, '1')}}" stepKey="seeColumnPaddingStyleOnStageAfterSave"/>
1059-
<seeElement selector="{{ColumnOnBackend.classes('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value, '1')}}" stepKey="seeColumnClassOnStageAfterSave"/>
1052+
<seeElement selector="{{ColumnOnBackend.alignment('1', '1', PageBuilderAdvancedAlignmentPropertyLeft.value)}}" stepKey="seetextAlignStyleOnStageAfterSave"/>
1053+
<seeElement selector="{{ColumnOnBackend.border('1', '1', PageBuilderAdvancedBorderPropertyDotted.value)}}" stepKey="seeColumnBorderStyleOnStageAfterSave"/>
1054+
<seeElement selector="{{ColumnOnBackend.borderColor('1', '1', PageBuilderAdvancedBorderColorProperty_ffffff.rgb)}}" stepKey="seeColumnBorderColorOnStageAfterSave"/>
1055+
<seeElement selector="{{ColumnOnBackend.borderWidth('1', '1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeColumnBorderWidthOnStageAfterSave"/>
1056+
<seeElement selector="{{ColumnOnBackend.borderRadius('1', '1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeColumnBorderRadiusStyleOnStageAfterSave"/>
1057+
<seeElement selector="{{ColumnOnBackend.margins('1', '1', PageBuilderAdvancedMarginsAndPaddingProperty.value)}}" stepKey="seeColumnMarginStyleOnStageAfterSave"/>
1058+
<seeElement selector="{{ColumnOnBackend.padding('1', '1', PageBuilderAdvancedMarginsAndPaddingProperty.value)}}" stepKey="seeColumnPaddingStyleOnStageAfterSave"/>
1059+
<seeElement selector="{{ColumnOnBackend.cssClasses('1', '1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeColumnClassOnStageAfterSave"/>
10601060
<!-- Validate form data has been persisted in the advanced section -->
10611061
<actionGroup ref="openPageBuilderEditPanel" stepKey="openSavedEditMenuOnStage">
10621062
<argument name="contentType" value="PageBuilderColumnContentType"/>

0 commit comments

Comments
 (0)