Skip to content

Commit a5a683b

Browse files
committed
MC-3852: Update Background Image Implementation on Tabs
- Resolve CR comments
1 parent bb6b3e0 commit a5a683b

7 files changed

+23
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="ColumnOnBackend">
1212
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
13+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=column]')[{{arg1}} - 1]" parameterized="true"/>
1314
<element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')]"/>
1415
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true"/>
1516
<element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<section name="RowOnStage">
2626
<element name="allRows" type="text" selector="//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')]"/>
2727
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]" parameterized="true"/>
28+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row]')[{{arg1}} - 1]" parameterized="true"/>
2829
<element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
2930
<element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
3031
<element name="baseCss" type="text" selector="div.pagebuilder-content-type.pagebuilder-row"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
</section>
3636
<section name="TabOnStage">
3737
<element name="base" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]" parameterized="true"/>
38+
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=tab-item]')[{{arg1}} - 1]" parameterized="true"/>
3839
<element name="all" type="button" selector=".pagebuilder-tab-item"/>
3940
<element name="tabHeader" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]" parameterized="true"/>
4041
<element name="tabHeaderEditableTitle" type="button" selector="(//ul[contains(@class, 'tabs-navigation')]//a[contains(@class, 'tab-title')])[{{arg1}}]//span[contains(@contenteditable, 'true')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTests.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1899,7 +1899,7 @@
18991899
</before>
19001900
<after>
19011901
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
1902-
<!--<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>-->
1902+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
19031903
<actionGroup ref="logout" stepKey="logout"/>
19041904
</after>
19051905
<!-- Add Button Group To Tab -->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@
7777
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStage">
7878
<argument name="section" value="ColumnOnBackend"/>
7979
</actionGroup>
80+
<actionGroup ref="validateNoBackgroundImage" stepKey="validateNoBackgroundImageStage">
81+
<argument name="section" value="ColumnOnBackend"/>
82+
</actionGroup>
8083
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
8184
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
8285
<!-- Validate Stage After Save -->
@@ -87,6 +90,9 @@
8790
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
8891
<argument name="contentType" value="PageBuilderColumnContentType"/>
8992
</actionGroup>
93+
<actionGroup ref="validateNoBackgroundImage" stepKey="validateNoBackgroundImageStage1">
94+
<argument name="section" value="ColumnOnBackend"/>
95+
</actionGroup>
9096
<!-- Validate Edit Panel After Save -->
9197
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
9298
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBackgroundColor2">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,19 @@
7474
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStage">
7575
<argument name="section" value="RowOnStage"/>
7676
</actionGroup>
77+
<actionGroup ref="validateNoBackgroundImage" stepKey="validateNoBackgroundImageStage">
78+
<argument name="section" value="RowOnStage"/>
79+
</actionGroup>
7780
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
7881
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
7982
<!-- Validate Stage After Save -->
8083
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
8184
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStage2">
8285
<argument name="section" value="RowOnStage"/>
8386
</actionGroup>
87+
<actionGroup ref="validateNoBackgroundImage" stepKey="validateNoBackgroundImageStage1">
88+
<argument name="section" value="RowOnStage"/>
89+
</actionGroup>
8490
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
8591
<argument name="contentType" value="PageBuilderRowContentType"/>
8692
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,19 @@
7979
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStage">
8080
<argument name="section" value="TabOnStage"/>
8181
</actionGroup>
82+
<actionGroup ref="validateNoBackgroundImage" stepKey="validateNoBackgroundImageStage">
83+
<argument name="section" value="TabOnStage"/>
84+
</actionGroup>
8285
<!-- Validate Stage After Save -->
8386
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
8487
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
8588
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
8689
<actionGroup ref="validateBackgroundAttributesWithNoImageOrColor" stepKey="validateStageAfterSave">
8790
<argument name="section" value="TabOnStage"/>
8891
</actionGroup>
92+
<actionGroup ref="validateNoBackgroundImage" stepKey="validateNoBackgroundImageStage1">
93+
<argument name="section" value="TabOnStage"/>
94+
</actionGroup>
8995
<!-- Validate Edit Panel After Save -->
9096
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanelAfterSave"/>
9197
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel2">
@@ -140,7 +146,7 @@
140146
<stories value="Tabs"/>
141147
<title value="Tab Item - Validate Background Configuration Updated Values"/>
142148
<description value="Saved tab has updated values on Background section"/>
143-
<severity value="AVERAGE"/>
149+
<severity value="CRITICAL"/>
144150
<useCaseId value="MC-913"/>
145151
<testCaseId value="MC-3619"/>
146152
<group value="pagebuilder"/>

0 commit comments

Comments
 (0)