Skip to content

Commit a90d6bd

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 dce1ac8 commit a90d6bd

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@
523523
<data key="name">Margins and Padding</data>
524524
<data key="section">advanced</data>
525525
<data key="fieldName">margins_and_padding</data>
526+
<data key="value">5</data>
526527
<data key="marginTop">5</data>
527528
<data key="marginRight">5</data>
528529
<data key="marginBottom">5</data>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +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="columnTextAlign" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'text-align: {{arg1}}')]" parameterized="true"/>
35-
<element name="columnBorder" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'border-style: {{arg1}}') and contains(@style, 'border-color: {{arg2}}') and contains(@style, 'border-width: {{arg3}}px')]" parameterized="true"/>
36-
<element name="columnBorderRadius" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'border-radius: {{arg1}}px')]" parameterized="true"/>
37-
<element name="columnMargin" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'margin: {{arg1}}px')]" parameterized="true"/>
38-
<element name="columnPadding" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@style, 'padding: {{arg1}}px')]" parameterized="true"/>
39-
<element name="columnClass" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column') and contains(@class, '{{arg1}}')]" 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"/>
4042
<!-- Background Configuration -->
4143
<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"/>
4244
<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: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -931,18 +931,17 @@
931931
<seeElement selector="{{ColumnOnFrontend.column3Appearance}}" stepKey="seeColumn3AppearanceApplied2"/>
932932
<seeElement selector="{{ColumnOnFrontend.column3BackgroundColorGrey}}" stepKey="seeColumn3BackgroundColorApplied2"/>
933933
</test>
934-
<test name="ColumnValidateAdvancedConfigurationDefaultValues">
934+
<test name="ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValues">
935935
<annotations>
936936
<features value="PageBuilder"/>
937937
<stories value="Column"/>
938-
<title value="Validate Advanced Configuration Default Values"/>
939-
<description value="Validate the default values for every attribute in the Advanced Configuration form and on Stage for Column."/>
938+
<title value="Validate Default and Update Advanced Configuration Default Values"/>
939+
<description value="Validate the default values and updating values for every attribute in the Advanced Configuration form and on Stage for Column."/>
940940
<severity value="CRITICAL"/>
941941
<useCaseId value="MAGETWO-83415"/>
942942
<testCaseId value="MC-2746"/>
943943
<group value="pagebuilder"/>
944944
<group value="pagebuilder-column"/>
945-
<group value="m"/>
946945
</annotations>
947946
<before>
948947
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -1033,32 +1032,31 @@
10331032
<actionGroup ref="fillSlideOutPanelFieldMarginsAndPadding" stepKey="enterAdvancedMarginsAndPaddingProperty">
10341033
<argument name="property" value="PageBuilderAdvancedMarginsAndPaddingProperty"/>
10351034
</actionGroup>
1036-
10371035
<!-- Save form data -->
10381036
<actionGroup ref="saveEditPanelSettings" stepKey="saveRowEditPanelSettings"/>
1039-
10401037
<!-- Validate Stage -->
10411038
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
10421039
<waitForElementVisible time="2" selector="{{ColumnOnBackend.column}}" stepKey="waitForBackEndColumn"/>
1043-
<seeElement selector="{{ColumnOnBackend.columnTextAlign(PageBuilderAdvancedAlignmentPropertyLeft.value)}}" stepKey="seeColumnTextAlignStyleOnStage"/>
1044-
<seeElement selector="{{ColumnOnBackend.columnBorder(PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_ffffff.rgb, PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeColumnBorderStyleOnStage"/>
1045-
<seeElement selector="{{ColumnOnBackend.columnBorderRadius(PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeColumnBorderRadiusStyleOnStage"/>
1046-
<seeElement selector="{{ColumnOnBackend.columnMargin(PageBuilderAdvancedMarginsAndPaddingProperty.marginTop)}}" stepKey="seeColumnMarginStyleOnStage"/>
1047-
<seeElement selector="{{ColumnOnBackend.columnPadding(PageBuilderAdvancedMarginsAndPaddingProperty.paddingTop)}}" stepKey="seeColumnPaddingStyleOnStage"/>
1048-
<seeElement selector="{{ColumnOnBackend.columnClass(PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeColumnClassOnStage"/>
1049-
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"/>
10501048
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
10511049
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1052-
10531050
<!-- Validate Stage After Save -->
10541051
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1055-
<seeElement selector="{{ColumnOnBackend.columnTextAlign(PageBuilderAdvancedAlignmentPropertyLeft.value)}}" stepKey="seeColumnTextAlignStyleOnStageAfterSave"/>
1056-
<seeElement selector="{{ColumnOnBackend.columnBorder(PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_ffffff.rgb, PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeColumnBorderStyleOnStageAfterSave"/>
1057-
<seeElement selector="{{ColumnOnBackend.columnBorderRadius(PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeColumnBorderRadiusStyleOnStageAfterSave"/>
1058-
<seeElement selector="{{ColumnOnBackend.columnMargin(PageBuilderAdvancedMarginsAndPaddingProperty.marginTop)}}" stepKey="seeColumnMarginStyleOnStageAfterSave"/>
1059-
<seeElement selector="{{ColumnOnBackend.columnPadding(PageBuilderAdvancedMarginsAndPaddingProperty.paddingTop)}}" stepKey="seeColumnPaddingStyleOnStageAfterSave"/>
1060-
<seeElement selector="{{ColumnOnBackend.columnClass(PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeColumnClassOnStageAfterSave"/>
1061-
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"/>
10621060
<!-- Validate form data has been persisted in the advanced section -->
10631061
<actionGroup ref="openPageBuilderEditPanel" stepKey="openSavedEditMenuOnStage">
10641062
<argument name="contentType" value="PageBuilderColumnContentType"/>
@@ -1079,12 +1077,11 @@
10791077
<seeInField userInput="{{PageBuilderAdvancedMarginsAndPaddingProperty.paddingRight}}" selector="{{AdvancedForm.advancedPaddingRight}}" stepKey="assertPaddingRightSavedInColumn"/>
10801078
<seeInField userInput="{{PageBuilderAdvancedMarginsAndPaddingProperty.paddingLeft}}" selector="{{AdvancedForm.advancedPaddingLeft}}" stepKey="assertPaddingLefSavedInColumn"/>
10811079
<seeInField userInput="{{PageBuilderAdvancedMarginsAndPaddingProperty.paddingBottom}}" selector="{{AdvancedForm.advancedPaddingBottom}}" stepKey="assertPaddingBottomSavedInColumn"/>
1082-
10831080
<!-- Validate the correct styles have been applied to the front-end -->
10841081
<amOnPage url="column{{PageBuilderPageTitle.pageName}}" stepKey="amOnPageBuilderPage"/>
10851082
<waitForPageLoad stepKey="waitForPageLoadStoreFront"/>
10861083
<waitForElementVisible time="2" selector="{{ColumnOnFrontend.columnDisplay}}" stepKey="waitForFrontEndColumn"/>
1087-
<seeElement selector="{{ColumnOnFrontend.columnTextAlign}}" stepKey="seeColumnTextAlignStyle"/>
1084+
<seeElement selector="{{ColumnOnFrontend.columnTextAlign}}" stepKey="seetextAlignStyle"/>
10881085
<seeElement selector="{{ColumnOnFrontend.columnBorder}}" stepKey="seeColumnBorderStyle"/>
10891086
<seeElement selector="{{ColumnOnFrontend.columnBorderRadius}}" stepKey="seeColumnBorderRadiusStyle"/>
10901087
<seeElement selector="{{ColumnOnFrontend.columnMargin}}" stepKey="seeColumnMarginStyle"/>

0 commit comments

Comments
 (0)