Skip to content

Commit 13d318a

Browse files
committed
#421: Setting Empty Border Radius on Tab Item Errors and Breaks Tab Item Content
- Code Review Feedback/Amends
1 parent 2efc546 commit 13d318a

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<element name="tabContentType" type="button" selector="(//div[@class='tabs-content']//div[@data-content-type='tab-item'])[{{arg1}}]/div[1]/hr" parameterized="true"/>
2727
<element name="tabContentText" type="button" selector="(//div[@class='tabs-content']//div[@data-content-type='tab-item'])[{{arg1}}]//div[contains(@data-content-type, 'text')][1]" parameterized="true"/>
2828
<element name="tabContentAdvancedStylesBorder" type="button" selector="(//div[@class='tabs-content']//div[@data-content-type='tab-item'])[{{arg1}}][contains(@style, 'border-style: {{arg2}}') and contains(@style, 'border-color: {{arg3}}') and contains(@style, 'border-width: {{arg4}}px') and contains(@style, 'border-radius: {{arg5}}px')]" parameterized="true"/>
29+
<element name="tabContentAdvancedStylesBorderEmpty" type="button" selector="(//div[@class='tabs-content']//div[@data-content-type='tab-item'])[{{arg1}}][contains(@style, 'border-style: {{arg2}}') and contains(@style, 'border-color: {{arg3}}')][not(contains(@style, 'border-width:'))][not(contains(@style, 'border-radius:'))]" parameterized="true"/>
2930
<element name="tabContentAdvancedStyles" type="button" selector="(//div[@class='tabs-content']//div[@data-content-type='tab-item'])[{{arg1}}][contains(@style, 'text-align: {{arg2}}') and contains(@style, 'margin: {{arg3}}px') and contains(@style, 'padding: {{arg4}}px')]" parameterized="true"/>
3031
<element name="tabContentAdvancedClass" type="button" selector="(//div[@class='tabs-content']//div[@data-content-type='tab-item'])[{{arg1}}][contains(@class, '{{arg2}}')]" parameterized="true"/>
3132
<!-- Background Configuration -->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemUpdateAdvancedConfigurationValuesTest.xml

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</actionGroup>
4141
<waitForPageLoad stepKey="waitForOptionsPanel" time="30"/>
4242
<!-- Open Tabs Panel -->
43-
<comment userInput="Add and Customize Tab 1" stepKey="AC1"/>
43+
<comment userInput="Add and customize first tab" stepKey="AC1"/>
4444
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
4545
<argument name="section" value="TabOnStage"/>
4646
</actionGroup>
@@ -71,7 +71,7 @@
7171
<argument name="property" value="PageBuilderAdvancedMarginsAndPaddingProperty"/>
7272
</actionGroup>
7373
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
74-
<comment userInput="Add and Customize Tab 2" stepKey="AC2"/>
74+
<comment userInput="Add and customize second tab" stepKey="AC2"/>
7575
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="seeTabHeader1"/>
7676
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType">
7777
<argument name="contentType" value="PageBuilderTabsContentType"/>
@@ -80,12 +80,30 @@
8080
<argument name="section" value="TabOnStage"/>
8181
<argument name="targetIndex" value="2"/>
8282
</actionGroup>
83+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAlignmentRight">
84+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
85+
</actionGroup>
86+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterBorder2">
87+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDotted"/>
88+
</actionGroup>
89+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderColor2">
90+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_FF0000"/>
91+
</actionGroup>
8392
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth2">
8493
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty_Empty"/>
8594
</actionGroup>
8695
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderRadius2">
8796
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty_Empty"/>
8897
</actionGroup>
98+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterCSSClasses2">
99+
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyOneClass"/>
100+
</actionGroup>
101+
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
102+
<argument name="property" value="PageBuilderMarginsPropertyUnique"/>
103+
</actionGroup>
104+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
105+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
106+
</actionGroup>
89107
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
90108
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
91109
<!-- Add and Customize Tab 3 -->
@@ -97,7 +115,7 @@
97115
<argument name="section" value="TabOnStage"/>
98116
<argument name="targetIndex" value="3"/>
99117
</actionGroup>
100-
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAlignmentRight">
118+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAlignmentRight2">
101119
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
102120
</actionGroup>
103121
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterBorder3">
@@ -141,25 +159,27 @@
141159
<argument name="from" value="2"/>
142160
<argument name="to" value="3"/>
143161
</actionGroup>
144-
<comment userInput="Verify Tab 3 on Stage" stepKey="verifyTab3OnStage"/>
145-
<waitForPageLoad stepKey="waitForPageLoadAdmin2" time="30"/>
162+
<!-- Verify Tab 3 on Stage -->
146163
<waitForElementVisible selector="{{TabOnStage.tab3ContentAdvancedStyles}}" stepKey="seeTab3ContentAdvancedStylesInAdminPreview"/>
147164
<!-- Verify in Storefront -->
148165
<amOnPage url="{{PageBuilderTabsContentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnPageBuilderPage"/>
149166
<waitForPageLoad stepKey="waitForPageLoadStoreFront" time="30"/>
150-
<comment userInput="Verify Tab 1 on Storefront" stepKey="AC5"/>
167+
<comment userInput="Verify tab 1 on storefront" stepKey="AC5"/>
151168
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('1', PageBuilderAdvancedAlignmentPropertyCenter.value, PageBuilderAdvancedMarginsAndPaddingProperty.marginLeft, PageBuilderAdvancedMarginsAndPaddingProperty.paddingLeft)}}" stepKey="seeTabContentAdvancedStylesInStorefront1"/>
152169
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('1', PageBuilderAdvancedBorderPropertySolid.value, PageBuilderAdvancedBorderColorProperty.rgb, PageBuilderAdvancedBorderWidthProperty10.value, PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront1"/>
153170
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedClass('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeTabContentClassInStorefront1"/>
154171
<click selector="{{TabOnStorefront.tabHeader('2')}}" stepKey="switchToTab"/>
155172
<waitForPageLoad stepKey="waitForTabChangeAnimationStorefront" time="30"/>
156173
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
157-
<waitForElementVisible selector="{{TabOnStorefront.container('2')}}" stepKey="seeNewTabContent2"/>
158-
<!-- Verify Tab 2 on Storefront -->
174+
<waitForElementVisible selector="{{TabOnStorefront.container('2')}}" stepKey="seeNewTabContent"/>
175+
<comment userInput="Verify tab 2 on storefront" stepKey="AC6"/>
176+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('2', PageBuilderAdvancedAlignmentPropertyRight.value, PageBuilderMarginsPropertyUnique.value, PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeTabHeaderItemAdvancedStylesInStorefront2"/>
177+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorderEmpty('2', PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_FF0000.rgb)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront2"/>
178+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedClass('2', PageBuilderAdvancedCssClassesPropertyOneClass.value)}}" stepKey="seeTabContentClassInStorefront2"/>
159179
<click selector="{{TabOnStorefront.tabHeader('3')}}" stepKey="switchToTab2"/>
160180
<waitForPageLoad stepKey="waitForTabChangeAnimationStorefront2" time="30"/>
161181
<scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
162-
<waitForElementVisible selector="{{TabOnStorefront.container('3')}}" stepKey="seeNewTabContent3"/>
182+
<waitForElementVisible selector="{{TabOnStorefront.container('3')}}" stepKey="seeNewTabContent2"/>
163183
<!-- Verify Tab 3 on Storefront -->
164184
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('3', PageBuilderAdvancedAlignmentPropertyRight.value, PageBuilderMarginsPropertyUnique.value, PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeTabHeaderItemAdvancedStylesInStorefront3"/>
165185
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('3', PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_FF0000.rgb, PageBuilderAdvancedBorderWidthProperty500.value, PageBuilderAdvancedBorderRadiusProperty500.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront3"/>

0 commit comments

Comments
 (0)