Skip to content

Commit 0cf2e98

Browse files
davemacaulaydavemacaulay
committed
MC-3895: Banner and Slide has an overlay transparency field that needs to be removed in favor of transparent color
- Resolve further tests
1 parent 8cc2e4c commit 0cf2e98

File tree

5 files changed

+16
-137
lines changed

5 files changed

+16
-137
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -250,31 +250,4 @@
250250
<data key="value">70</data>
251251
<data key="decimal">0.7</data>
252252
</entity>
253-
<entity name="PageBuilderBannerOverlayTransparencyDefaultProperty" type="pagebuilder_banner_overlayTransparencyDefault_property">
254-
<data key="name">Overlay Transparency</data>
255-
<data key="section">contents</data>
256-
<data key="fieldName">overlay_transparency</data>
257-
<data key="value">0</data>
258-
</entity>
259-
<entity name="PageBuilderBannerOverlayTransparencyInvalidMinProperty" type="pagebuilder_banner_overlayTransparency_property">
260-
<data key="name">Overlay Transparency</data>
261-
<data key="section">contents</data>
262-
<data key="fieldName">overlay_transparency</data>
263-
<data key="value">-1</data>
264-
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
265-
</entity>
266-
<entity name="PageBuilderBannerOverlayTransparencyInvalidMaxProperty" type="pagebuilder_banner_overlayTransparency_property">
267-
<data key="name">Overlay Transparency</data>
268-
<data key="section">contents</data>
269-
<data key="fieldName">overlay_transparency</data>
270-
<data key="value">101</data>
271-
<data key="errorMessage">Please enter a value less than or equal to 100.</data>
272-
</entity>
273-
<entity name="PageBuilderBannerOverlayTransparencyInvalidTypeProperty" type="pagebuilder_banner_overlayTransparency_property">
274-
<data key="name">Overlay Transparency</data>
275-
<data key="section">contents</data>
276-
<data key="fieldName">overlay_transparency</data>
277-
<data key="value">abc</data>
278-
<data key="errorMessage">Please enter a valid number in this field.</data>
279-
</entity>
280253
</entities>

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,10 +1014,7 @@
10141014
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
10151015
</actionGroup>
10161016
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayColor">
1017-
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
1018-
</actionGroup>
1019-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
1020-
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
1017+
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
10211018
</actionGroup>
10221019
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
10231020
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -1066,7 +1063,7 @@
10661063
<seeElement selector="{{BannerOnBackend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStage"/>
10671064
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage"/>
10681065
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage"/>
1069-
<seeElement selector="{{BannerOnBackend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage"/>
1066+
<seeElement selector="{{BannerOnBackend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundColor"/>
10701067
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
10711068
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
10721069
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
@@ -1098,7 +1095,7 @@
10981095
<seeElement selector="{{BannerOnBackend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStage2"/>
10991096
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage2"/>
11001097
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage2"/>
1101-
<seeElement selector="{{BannerOnBackend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage2"/>
1098+
<seeElement selector="{{BannerOnBackend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundColor2"/>
11021099
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
11031100
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
11041101
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>
@@ -1161,10 +1158,7 @@
11611158
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
11621159
</actionGroup>
11631160
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayColor">
1164-
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
1165-
</actionGroup>
1166-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
1167-
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
1161+
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
11681162
</actionGroup>
11691163
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
11701164
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -1216,7 +1210,7 @@
12161210
<seeElement selector="{{BannerOnFrontend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStorefront"/>
12171211
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
12181212
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStorefront"/>
1219-
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStorefront"/>
1213+
<seeElement selector="{{BannerOnFrontend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundStorefront"/>
12201214
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
12211215
<seeElement selector="{{BannerOnFrontend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStorefront"/>
12221216
<seeElement selector="{{BannerOnFrontend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStorefront"/>
@@ -1243,7 +1237,7 @@
12431237
<seeElement selector="{{BannerOnFrontend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeMobileButtonTypeStorefront"/>
12441238
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeMobileButtonTextStorefront"/>
12451239
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeMobileOverlayStateStorefront"/>
1246-
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeMobileOverlayColorAndTransparencyStorefront"/>
1240+
<seeElement selector="{{BannerOnFrontend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeMobileOverlayBackgroundStorefront"/>
12471241
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeMobileAlignmentStorefront"/>
12481242
<seeElement selector="{{BannerOnFrontend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeMobileBorderStorefront"/>
12491243
<seeElement selector="{{BannerOnFrontend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeMobileBorderColorStorefront"/>

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -937,10 +937,7 @@
937937
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
938938
</actionGroup>
939939
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayColor">
940-
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
941-
</actionGroup>
942-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
943-
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
940+
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
944941
</actionGroup>
945942
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
946943
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -989,7 +986,7 @@
989986
<seeElement selector="{{BannerOnBackend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStage"/>
990987
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage"/>
991988
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage"/>
992-
<seeElement selector="{{BannerOnBackend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage"/>
989+
<seeElement selector="{{BannerOnBackend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundColor"/>
993990
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
994991
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
995992
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
@@ -1021,7 +1018,7 @@
10211018
<seeElement selector="{{BannerOnBackend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStage2"/>
10221019
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStage2"/>
10231020
<seeElement selector="{{BannerOnBackend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStage2"/>
1024-
<seeElement selector="{{BannerOnBackend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStage2"/>
1021+
<seeElement selector="{{BannerOnBackend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundColor2"/>
10251022
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
10261023
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
10271024
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>
@@ -1084,10 +1081,7 @@
10841081
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
10851082
</actionGroup>
10861083
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayColor">
1087-
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
1088-
</actionGroup>
1089-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeOverlayTransparency">
1090-
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
1084+
<argument name="property" value="PageBuilderBannerOverlayColor_Blue_Opaque"/>
10911085
</actionGroup>
10921086
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
10931087
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
@@ -1139,7 +1133,7 @@
11391133
<seeElement selector="{{BannerOnFrontend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeButtonTypeStorefront"/>
11401134
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
11411135
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeOverlayStateStorefront"/>
1142-
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayColorAndTransparencyStorefront"/>
1136+
<seeElement selector="{{BannerOnFrontend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeOverlayBackgroundStorefront"/>
11431137
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
11441138
<seeElement selector="{{BannerOnFrontend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStorefront"/>
11451139
<seeElement selector="{{BannerOnFrontend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStorefront"/>
@@ -1166,7 +1160,7 @@
11661160
<seeElement selector="{{BannerOnFrontend.buttonType('1', PageBuilderBannerButtonTypeSecondaryProperty.value)}}" stepKey="seeMobileButtonTypeStorefront"/>
11671161
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeMobileButtonTextStorefront"/>
11681162
<seeElement selector="{{BannerOnFrontend.showOverlay('1', PageBuilderBannerShowContentOverlayAlwaysProperty.value)}}" stepKey="seeMobileOverlayStateStorefront"/>
1169-
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerOverlayColor_FF0000.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeMobileOverlayColorAndTransparencyStorefront"/>
1163+
<seeElement selector="{{BannerOnFrontend.overlayBackgroundColor('1', PageBuilderBannerOverlayColor_Blue_Opaque.value)}}" stepKey="seeMobileOverlayBackgroundStorefront"/>
11701164
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeMobileAlignmentStorefront"/>
11711165
<seeElement selector="{{BannerOnFrontend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeMobileBorderStorefront"/>
11721166
<seeElement selector="{{BannerOnFrontend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeMobileBorderColorStorefront"/>

0 commit comments

Comments
 (0)