Skip to content

Commit d1ce63e

Browse files
davemacaulaydavemacaulay
committed
MC-4126: Duplicate row border after switching Row appearance
- Add test to validate row border is fixed
1 parent c47ec39 commit d1ce63e

File tree

2 files changed

+71
-1
lines changed

2 files changed

+71
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] .element-children')[{{arg2}}].clientWidth" parameterized="true"/>
3737
<element name="appearanceContained" type="text" selector="(//div[@data-role='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
3838
<element name="appearanceFullWidthFullBleed" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
39-
4039
<!-- Background Configuration -->
4140
<element name="backgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
4241
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
@@ -67,6 +66,11 @@
6766
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
6867
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6968
</section>
69+
<section name="RowOnStage_Contained_Invalid">
70+
<element name="border" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
71+
<element name="borderColor" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
72+
<element name="borderWidth" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
73+
</section>
7074
<section name="RowOnStorefront">
7175
<element name="base" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div" parameterized="true"/>
7276
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row] > div')[{{arg1}} - 1]" parameterized="true"/>

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,4 +1832,70 @@
18321832
<argument name="containerTargetIndex" value="1" />
18331833
</actionGroup>
18341834
</test>
1835+
<test name="RowValidateBorderOnAppearanceChange">
1836+
<annotations>
1837+
<features value="PageBuilder"/>
1838+
<stories value="Row"/>
1839+
<title value="Row border should change to correct element"/>
1840+
<description value="A user should be able to change the appearance on a row and see the border update as expected"/>
1841+
<severity value="MAJOR"/>
1842+
<useCaseId value="MC-4126"/>
1843+
<testCaseId value="MC-4229"/>
1844+
<group value="pagebuilder"/>
1845+
<group value="pagebuilder-row"/>
1846+
</annotations>
1847+
<before>
1848+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1849+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1850+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1851+
</before>
1852+
<after>
1853+
<actionGroup ref="logout" stepKey="logout"/>
1854+
</after>
1855+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1856+
<argument name="contentType" value="PageBuilderRowContentType"/>
1857+
</actionGroup>
1858+
<!-- Select full width appearance -->
1859+
<comment userInput="Select full width appearance" stepKey="commentFullWidth"/>
1860+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRowFullWidth">
1861+
<argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
1862+
</actionGroup>
1863+
<!-- I configure border within advanced section -->
1864+
<comment userInput="I configure border within advanced section" stepKey="commentConfigureBorder"/>
1865+
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
1866+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
1867+
</actionGroup>
1868+
<actionGroup ref="fillOutColorPicker" stepKey="fillOutColor">
1869+
<argument name="colorCode" value="PageBuilderAdvancedBorderColorProperty_green"/>
1870+
</actionGroup>
1871+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="seeHEXInField7">
1872+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_green"/>
1873+
</actionGroup>
1874+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth">
1875+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty10"/>
1876+
</actionGroup>
1877+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1878+
<waitForElementVisible selector="{{RowOnStage.base('1')}}" stepKey="waitForElementVisible"/>
1879+
<waitForElementVisible selector="{{RowOnStage.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="waitForBorderVisible"/>
1880+
<waitForElementVisible selector="{{RowOnStage.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="waitForBorderColorVisible"/>
1881+
<waitForElementVisible selector="{{RowOnStage.borderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="waitForBorderWidthVisible"/>
1882+
<!-- Change appearance to contained -->
1883+
<comment userInput="Change appearance to contained" stepKey="commentContained"/>
1884+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage1">
1885+
<argument name="contentType" value="PageBuilderRowContentType"/>
1886+
</actionGroup>
1887+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRowContained">
1888+
<argument name="property" value="PageBuilderRowAppearance_Contained"/>
1889+
</actionGroup>
1890+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
1891+
<waitForElementVisible selector="{{RowOnStage.base('1')}}" stepKey="waitForElementVisible1"/>
1892+
<waitForElementVisible selector="{{RowOnStage.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="waitForBorderVisible1"/>
1893+
<waitForElementVisible selector="{{RowOnStage.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="waitForBorderColorVisible1"/>
1894+
<waitForElementVisible selector="{{RowOnStage.borderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="waitForBorderWidthVisible1"/>
1895+
<!-- Verify the border is not on the outside of the contained row -->
1896+
<comment userInput="Verify the border is not on the outside of the contained row" stepKey="commentVerifyBorder"/>
1897+
<dontSeeElement selector="{{RowOnStage_Contained_Invalid.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="dontSeeBorderOnOutside" />
1898+
<dontSeeElement selector="{{RowOnStage_Contained_Invalid.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="dontSeeBorderColorOnOutside" />
1899+
<dontSeeElement selector="{{RowOnStage_Contained_Invalid.borderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="dontSeeBorderWidthOnOutside" />
1900+
</test>
18351901
</tests>

0 commit comments

Comments
 (0)