Skip to content

Commit ee498be

Browse files
bluemwhitewbluemwhitew
committed
#421: Setting Empty Border Radius on Tab Item Errors and Breaks Tab Item Content
- Code Review Feedback/Amends
1 parent eccf6ac commit ee498be

File tree

2 files changed

+41
-36
lines changed

2 files changed

+41
-36
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<element name="tabHeaderItemActive" type="button" selector="//ul[contains(@class, 'tabs-navigation')]/li[{{arg1}}][contains(@class, 'ui-state-active')]" parameterized="true"/>
2020
<element name="tabHeaderItemAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//descendant::*[contains(@class,'tabs-navigation')]/li[contains(@style, 'border-style: solid; border-radius: 12px; border-color: rgb(0, 0, 0); border-width: 10px; margin-bottom: -10px; margin-left: -10px;')])"/>
2121
<element name="tab1ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[1]//div[contains(@class, 'pagebuilder-tab-item') and contains(@style, 'text-align: center;') and contains(@style, 'border-style: solid;') and contains(@style, 'border-color: rgb(0, 0, 0);') and contains(@style, 'border-width: 10px;') and contains(@style, 'border-radius: 12px;') and contains(@style, 'margin: 5px;') and contains(@style, 'padding: 5px;')]"/>
22-
<element name="tab2ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[2]//div[contains(@class, 'pagebuilder-tab-item') and contains(@style, 'text-align: right;') and contains(@style, 'border-style: dotted;') and contains(@style, 'border-color: rgb(255, 0, 0);') and contains(@style, 'border-width: 500px;') and contains(@style, 'border-radius: 500px;') and contains(@style, 'margin: 1px 2px 3px 4px;') and contains(@style, 'padding: 1px 2px 3px 4px;')]"/>
23-
<element name="tab3ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[3]//div[contains(@class, 'pagebuilder-tab-item')][not(contains(@style, 'border-width:'))][not(contains(@style, 'border-radius:'))]"/>
22+
<element name="tab2ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[2]//div[contains(@class, 'pagebuilder-tab-item')][not(contains(@style, 'border-width:'))][not(contains(@style, 'border-radius:'))]"/>
23+
<element name="tab3ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[3]//div[contains(@class, 'pagebuilder-tab-item') and contains(@style, 'text-align: right;') and contains(@style, 'border-style: dotted;') and contains(@style, 'border-color: rgb(255, 0, 0);') and contains(@style, 'border-width: 500px;') and contains(@style, 'border-radius: 500px;') and contains(@style, 'margin: 1px 2px 3px 4px;') and contains(@style, 'padding: 1px 2px 3px 4px;')]"/>
2424
<element name="empty" type="button" selector="(//div[contains(@class, 'pagebuilder-tabs')]//div[contains(@class, 'pagebuilder-tab-item') and contains(@class, 'empty-container')])"/>
2525
<element name="openOptionsMenu" type="button" selector="(//ul[contains(@class,'tabs-navigation')]//a[contains(@class,'tab-title')])[{{arg1}}]" parameterized="true"/>
2626
<element name="optionsMenu" type="button" selector="(//ul[contains(@class,'tabs-navigation')]//div[contains(@class,'pagebuilder-options-wrapper')])[{{arg1}}]" parameterized="true"/>

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

Lines changed: 39 additions & 34 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 first tab" stepKey="AC1"/>
43+
<comment userInput="Add and Customize Tab 1" stepKey="AC1"/>
4444
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
4545
<argument name="section" value="TabOnStage"/>
4646
</actionGroup>
@@ -71,57 +71,57 @@
7171
<argument name="property" value="PageBuilderAdvancedMarginsAndPaddingProperty"/>
7272
</actionGroup>
7373
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
74-
<comment userInput="Add and customize second tab" stepKey="AC2"/>
74+
<comment userInput="Add and Customize Tab 2" stepKey="AC2"/>
7575
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="seeTabHeader1"/>
76-
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType">
76+
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType2">
7777
<argument name="contentType" value="PageBuilderTabsContentType"/>
7878
</actionGroup>
7979
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel2">
8080
<argument name="section" value="TabOnStage"/>
8181
<argument name="targetIndex" value="2"/>
8282
</actionGroup>
83+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth2">
84+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty_Empty"/>
85+
</actionGroup>
86+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderRadius2">
87+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty_Empty"/>
88+
</actionGroup>
89+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
90+
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
91+
<!-- Add and Customize Tab 3 -->
92+
<waitForElementVisible selector="{{TabOnStage.tabHeader('2')}}" stepKey="seeTabHeader2"/>
93+
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType3">
94+
<argument name="contentType" value="PageBuilderTabsContentType"/>
95+
</actionGroup>
96+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel3">
97+
<argument name="section" value="TabOnStage"/>
98+
<argument name="targetIndex" value="3"/>
99+
</actionGroup>
83100
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAlignmentRight">
84101
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyRight"/>
85102
</actionGroup>
86-
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterBorder2">
103+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterBorder3">
87104
<argument name="property" value="PageBuilderAdvancedBorderPropertyDotted"/>
88105
</actionGroup>
89-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderColor2">
106+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderColor3">
90107
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_FF0000"/>
91108
</actionGroup>
92-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth2">
109+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth3">
93110
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty500"/>
94111
</actionGroup>
95-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderRadius2">
112+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderRadius3">
96113
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty500"/>
97114
</actionGroup>
98-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterCSSClasses2">
115+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterCSSClasses3">
99116
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyOneClass"/>
100117
</actionGroup>
101-
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
118+
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins3">
102119
<argument name="property" value="PageBuilderMarginsPropertyUnique"/>
103120
</actionGroup>
104-
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
121+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding3">
105122
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
106123
</actionGroup>
107-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
108-
<comment userInput="Add and Customise Third Tab" stepKey="addThirdTab"/>
109-
<waitForElementVisible selector="{{TabOnStage.tabHeader('2')}}" stepKey="seeTabHeader2"/>
110-
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType2">
111-
<argument name="contentType" value="PageBuilderTabsContentType"/>
112-
</actionGroup>
113-
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel3">
114-
<argument name="section" value="TabOnStage"/>
115-
<argument name="targetIndex" value="3"/>
116-
</actionGroup>
117-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth3">
118-
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty_Empty"/>
119-
</actionGroup>
120-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderRadius3">
121-
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty_Empty"/>
122-
</actionGroup>
123124
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
124-
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
125125
<!-- Verify in Admin Preview -->
126126
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
127127
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -147,17 +147,22 @@
147147
<!-- Verify in Storefront -->
148148
<amOnPage url="{{PageBuilderTabsContentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnPageBuilderPage"/>
149149
<waitForPageLoad stepKey="waitForPageLoadStoreFront" time="30"/>
150-
<comment userInput="Verify tab 1 on storefront" stepKey="AC5"/>
150+
<!-- Verify Tab 1 on Storefront -->
151151
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('1', PageBuilderAdvancedAlignmentPropertyCenter.value, PageBuilderAdvancedMarginsAndPaddingProperty.marginLeft, PageBuilderAdvancedMarginsAndPaddingProperty.paddingLeft)}}" stepKey="seeTabContentAdvancedStylesInStorefront1"/>
152152
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('1', PageBuilderAdvancedBorderPropertySolid.value, PageBuilderAdvancedBorderColorProperty.rgb, PageBuilderAdvancedBorderWidthProperty10.value, PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront1"/>
153153
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedClass('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeTabContentClassInStorefront1"/>
154-
<click selector="{{TabOnStorefront.tabHeader('2')}}" stepKey="switchToTab"/>
154+
<click selector="{{TabOnStorefront.tabHeader('2')}}" stepKey="switchToTab2"/>
155155
<waitForPageLoad stepKey="waitForTabChangeAnimationStorefront" time="30"/>
156156
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
157-
<waitForElementVisible selector="{{TabOnStorefront.container('2')}}" stepKey="seeNewTabContent"/>
158-
<comment userInput="Verify tab 2 on storefront" stepKey="AC6"/>
159-
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('2', PageBuilderAdvancedAlignmentPropertyRight.value, PageBuilderMarginsPropertyUnique.value, PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeTabHeaderItemAdvancedStylesInStorefront2"/>
160-
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('2', PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_FF0000.rgb, PageBuilderAdvancedBorderWidthProperty500.value, PageBuilderAdvancedBorderRadiusProperty500.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront2"/>
161-
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedClass('2', PageBuilderAdvancedCssClassesPropertyOneClass.value)}}" stepKey="seeTabContentClassInStorefront2"/>
157+
<waitForElementVisible selector="{{TabOnStorefront.container('2')}}" stepKey="seeNewTabContent2"/>
158+
<!-- Verify Tab 2 on Storefront -->
159+
<click selector="{{TabOnStorefront.tabHeader('3')}}" stepKey="switchToTab3"/>
160+
<waitForPageLoad stepKey="waitForTabChangeAnimationStorefront2" time="30"/>
161+
<scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
162+
<waitForElementVisible selector="{{TabOnStorefront.container('3')}}" stepKey="seeNewTabContent3"/>
163+
<!-- Verify Tab 3 on Storefront -->
164+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('3', PageBuilderAdvancedAlignmentPropertyRight.value, PageBuilderMarginsPropertyUnique.value, PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeTabHeaderItemAdvancedStylesInStorefront3"/>
165+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('3', PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_FF0000.rgb, PageBuilderAdvancedBorderWidthProperty500.value, PageBuilderAdvancedBorderRadiusProperty500.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront3"/>
166+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedClass('3', PageBuilderAdvancedCssClassesPropertyOneClass.value)}}" stepKey="seeTabContentClassInStorefront3"/>
162167
</test>
163168
</tests>

0 commit comments

Comments
 (0)