Skip to content

Commit fbb9f8a

Browse files
author
hannahnida
committed
Merge branch '558_7_content-type-style-attribute-removal' of hannahnida/magento2-page-builder into 558_7_content-type-style-attribute-removal
2 parents da29659 + f770475 commit fbb9f8a

File tree

14 files changed

+20
-20
lines changed

14 files changed

+20
-20
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,12 @@
398398
</actionGroup>
399399
<!-- Validate content type is enabled in Storefront -->
400400
<comment userInput="Validate content type is enabled in Storefront" stepKey="commentValidateShownStorefront"/>
401-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="waitForContentTypeShownStorefront1">
401+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="waitForContentTypeShownStorefront1">
402402
<argument name="selector" value="{{BannerOnFrontend.base('1')}}"/>
403403
<argument name="notExpectedProperty" value="none"/>
404404
<argument name="cssProperty" value="display"/>
405405
</actionGroup>
406-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="waitForContentTypeShownStorefront2">
406+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="waitForContentTypeShownStorefront2">
407407
<argument name="selector" value="{{BannerOnFrontend.base('2')}}"/>
408408
<argument name="notExpectedProperty" value="none"/>
409409
<argument name="cssProperty" value="display"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<switchToNextTab stepKey="switchBackToStorefront"/>
8787
<reloadPage stepKey="reloadStorefront"/>
8888
<waitForPageLoad stepKey="waitForStorefrontReload"/>
89-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeHiddenElement">
89+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeHiddenElement">
9090
<argument name="selector" value="{{BannerOnFrontend.base('1')}}"/>
9191
<argument name="notExpectedProperty" value="none"/>
9292
<argument name="cssProperty" value="display"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<switchToNextTab stepKey="switchBackToStorefront"/>
8888
<reloadPage stepKey="reloadStorefront"/>
8989
<waitForPageLoad stepKey="waitForStorefrontReload"/>
90-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeHiddenElement">
90+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeHiddenElement">
9191
<argument name="selector" value="{{BlockOnStorefront.advancedConfigurationPath('1')}}"/>
9292
<argument name="expectedProperty" value="none"/>
9393
<argument name="cssProperty" value="display"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnChildHideShowTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<switchToNextTab stepKey="switchBackToStorefront"/>
9696
<reloadPage stepKey="reloadStorefront"/>
9797
<waitForPageLoad stepKey="waitForStorefrontReload"/>
98-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeHiddenElement">
98+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeHiddenElement">
9999
<argument name="selector" value="{{HeadingOnStorefront.headingElement(PageBuilderHeadingTypeProperty_H2.value, '1')}}"/>
100100
<argument name="expectedProperty" value="none"/>
101101
<argument name="cssProperty" value="display"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<switchToNextTab stepKey="switchBackToStorefront"/>
102102
<reloadPage stepKey="reloadStorefront"/>
103103
<waitForPageLoad stepKey="waitForStorefrontReload"/>
104-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeHiddenElement">
104+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeHiddenElement">
105105
<argument name="selector" value="{{ProductsOnStorefront.advancedConfigurationPath('1')}}"/>
106106
<argument name="notExpectedProperty" value="none"/>
107107
<argument name="cssProperty" value="display"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@
9393
</actionGroup>
9494
<!-- Verify the border is not on the outside of the contained row -->
9595
<comment userInput="Verify the border is not on the outside of the contained row" stepKey="commentVerifyBorder"/>
96-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeBorderOnOutside">
96+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeBorderOnOutside">
9797
<argument name="selector" value="{{RowOnStage_Contained_Invalid.advancedConfigurationPath('1')}}"/>
9898
<argument name="notExpectedProperty" value="{{PageBuilderAdvancedBorderPropertyDouble.value}}"/>
9999
<argument name="cssProperty" value="borderStyle"/>
100100
</actionGroup>
101-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeBorderColorOnOutside">
101+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeBorderColorOnOutside">
102102
<argument name="selector" value="{{RowOnStage_Contained_Invalid.advancedConfigurationPath('1')}}"/>
103103
<argument name="notExpectedProperty" value="{{PageBuilderAdvancedBorderColorProperty_green.rgb}}"/>
104104
<argument name="cssProperty" value="borderColor"/>
105105
</actionGroup>
106-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeBorderWidthOnOutside">
106+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeBorderWidthOnOutside">
107107
<argument name="selector" value="{{RowOnStage_Contained_Invalid.advancedConfigurationPath('1')}}"/>
108108
<argument name="notExpectedProperty" value="{{PageBuilderAdvancedBorderWidthProperty10.value}}"/>
109109
<argument name="cssProperty" value="borderWidth"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<switchToNextTab stepKey="switchBackToStorefront"/>
119119
<reloadPage stepKey="reloadStorefront"/>
120120
<waitForPageLoad stepKey="waitForStorefrontReload"/>
121-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeHiddenElement">
121+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeHiddenElement">
122122
<argument name="selector" value="{{RowOnStorefront.main('1')}}"/>
123123
<argument name="notExpectedProperty" value="none"/>
124124
<argument name="cssProperty" value="display"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidatePaddingOnAppearanceChangeTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
6363
<argument name="cssProperty" value="padding"/>
6464
</actionGroup>
65-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeCollagePadding">
65+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeCollagePadding">
6666
<argument name="selector" value="{{SlideOnBackend.collagePaddingPath('1')}}"/>
6767
<argument name="notExpectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
6868
<argument name="cssProperty" value="padding"/>
@@ -83,7 +83,7 @@
8383
<argument name="expectedProperty" value="{{PageBuilderSlideItemOverlayColor_Blue_Opaque.value}}"/>
8484
<argument name="cssProperty" value="backgroundColor"/>
8585
</actionGroup>
86-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeDefaultPosterPadding">
86+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeDefaultPosterPadding">
8787
<argument name="selector" value="{{SlideOnBackend.posterPaddingPath('1')}}"/>
8888
<argument name="notExpectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
8989
<argument name="cssProperty" value="padding"/>
@@ -110,7 +110,7 @@
110110
<argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
111111
<argument name="cssProperty" value="padding"/>
112112
</actionGroup>
113-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeCollagePadding2">
113+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeCollagePadding2">
114114
<argument name="selector" value="{{SlideOnBackend.collagePaddingPath('1')}}"/>
115115
<argument name="notExpectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
116116
<argument name="cssProperty" value="padding"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDuplicateTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,12 @@
325325
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
326326
<argument name="contentType" value="PageBuilderSliderContentType"/>
327327
</actionGroup>
328-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="waitForContentTypeShownStorefront1">
328+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="waitForContentTypeShownStorefront1">
329329
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
330330
<argument name="notExpectedProperty" value="none"/>
331331
<argument name="cssProperty" value="display"/>
332332
</actionGroup>
333-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="waitForContentTypeShownStorefront2">
333+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="waitForContentTypeShownStorefront2">
334334
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('2')}}"/>
335335
<argument name="notExpectedProperty" value="none"/>
336336
<argument name="cssProperty" value="display"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<switchToNextTab stepKey="switchBackToStorefront"/>
9595
<reloadPage stepKey="reloadStorefront"/>
9696
<waitForPageLoad stepKey="waitForStorefrontReload"/>
97-
<actionGroup ref="NotValidateContentTypeStylesActionGroup" stepKey="dontSeeHiddenElement">
97+
<actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="dontSeeHiddenElement">
9898
<argument name="selector" value="{{SliderOnFrontend.advancedConfigurationPath('1')}}"/>
9999
<argument name="expectedProperty" value="none"/>
100100
<argument name="cssProperty" value="display"/>

0 commit comments

Comments
 (0)