Skip to content

Commit 1dfa16f

Browse files
committed
MC-3354: All Attributes Banner
- Fixing stepKeys for Banner never show buttons selection - Adding appearance validation on Banner adv config update tests - Adding additional validation to Banner on hover button tests
1 parent aa791d1 commit 1dfa16f

4 files changed

+31
-4
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
239239
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
240240
</actionGroup>
241-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBannerButtonShowOnHover">
241+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBannerButtonNeverShow">
242242
<argument name="property" value="PageBuilderBannerShowButtonNeverProperty"/>
243243
</actionGroup>
244244
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
@@ -553,6 +553,7 @@
553553
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStage"/>
554554
<seeElement selector="{{BannerOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStage"/>
555555
<seeElementInDOM selector="{{BannerOnBackend.button('1')}}" stepKey="seeButtonInDOMStage"/>
556+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStage"/>
556557
<seeElement selector="{{BannerOnBackend.transparentOverlay('1')}}" stepKey="seeTransparentOverlayStage"/>
557558
<moveMouseOver selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="moveMouseOverBannerStage"/>
558559
<seeElement selector="{{BannerOnBackend.button('1')}}" stepKey="seeButtonOnHoverStage"/>
@@ -566,6 +567,7 @@
566567
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStorefront"/>
567568
<seeElement selector="{{BannerOnFrontend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStorefront"/>
568569
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
570+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
569571
<seeElement selector="{{BannerOnFrontend.transparentOverlay('1')}}" stepKey="seeTransparentOverlayStorefront"/>
570572
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
571573
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
@@ -576,6 +578,7 @@
576578
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStorefrontMobile"/>
577579
<seeElement selector="{{BannerOnFrontend.mobileBackgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStorefrontMobile"/>
578580
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
581+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
579582
<seeElement selector="{{BannerOnFrontend.mobileTransparentOverlay('1')}}" stepKey="seeTransparentOverlayStorefrontMobile"/>
580583
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
581584
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
@@ -765,6 +768,7 @@
765768
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
766769
<!-- Validate Stage -->
767770
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
771+
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeAppearanceStage"/>
768772
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
769773
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
770774
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="seeBorderColorStage"/>
@@ -808,6 +812,7 @@
808812
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
809813
<!-- Validate Stage After Save -->
810814
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
815+
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeAppearanceStage2"/>
811816
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
812817
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
813818
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="seeBorderColorStage2"/>
@@ -851,6 +856,7 @@
851856
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
852857
<argument name="contentType" value="PageBuilderBannerContentType"/>
853858
</actionGroup>
859+
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeAppearanceStorefront"/>
854860
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
855861
<seeElementInDOM selector="{{BannerOnFrontend.alignmentMobile('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeInDOMMobileAlignmentStorefront"/>
856862
<dontSeeElement selector="{{BannerOnFrontend.alignmentMobile('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="dontSeeMobileAlignmentStorefront"/>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
239239
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
240240
</actionGroup>
241-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBannerButtonShowOnHover">
241+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBannerButtonNeverShow">
242242
<argument name="property" value="PageBuilderBannerShowButtonNeverProperty"/>
243243
</actionGroup>
244244
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
@@ -553,6 +553,7 @@
553553
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStage"/>
554554
<seeElement selector="{{BannerOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStage"/>
555555
<seeElementInDOM selector="{{BannerOnBackend.button('1')}}" stepKey="seeButtonInDOMStage"/>
556+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStage"/>
556557
<seeElement selector="{{BannerOnBackend.transparentOverlay('1')}}" stepKey="seeTransparentOverlayStage"/>
557558
<moveMouseOver selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="moveMouseOverBannerStage"/>
558559
<seeElement selector="{{BannerOnBackend.button('1')}}" stepKey="seeButtonOnHoverStage"/>
@@ -566,6 +567,7 @@
566567
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStorefront"/>
567568
<seeElement selector="{{BannerOnFrontend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStorefront"/>
568569
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
570+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
569571
<seeElement selector="{{BannerOnFrontend.transparentOverlay('1')}}" stepKey="seeTransparentOverlayStorefront"/>
570572
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
571573
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
@@ -576,6 +578,7 @@
576578
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStorefrontMobile"/>
577579
<seeElement selector="{{BannerOnFrontend.mobileBackgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStorefrontMobile"/>
578580
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
581+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
579582
<seeElement selector="{{BannerOnFrontend.mobileTransparentOverlay('1')}}" stepKey="seeTransparentOverlayStorefrontMobile"/>
580583
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
581584
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
@@ -765,6 +768,7 @@
765768
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
766769
<!-- Validate Stage -->
767770
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
771+
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeAppearanceStage"/>
768772
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
769773
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
770774
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="seeBorderColorStage"/>
@@ -808,6 +812,7 @@
808812
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
809813
<!-- Validate Stage After Save -->
810814
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
815+
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeAppearanceStage2"/>
811816
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
812817
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
813818
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="seeBorderColorStage2"/>
@@ -851,6 +856,7 @@
851856
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
852857
<argument name="contentType" value="PageBuilderBannerContentType"/>
853858
</actionGroup>
859+
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeAppearanceStorefront"/>
854860
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
855861
<seeElementInDOM selector="{{BannerOnFrontend.alignmentMobile('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeInDOMMobileAlignmentStorefront"/>
856862
<dontSeeElement selector="{{BannerOnFrontend.alignmentMobile('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="dontSeeMobileAlignmentStorefront"/>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColor">
239239
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
240240
</actionGroup>
241-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBannerButtonShowOnHover">
241+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBannerButtonNeverShow">
242242
<argument name="property" value="PageBuilderBannerShowButtonNeverProperty"/>
243243
</actionGroup>
244244
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
@@ -553,6 +553,7 @@
553553
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStage"/>
554554
<seeElement selector="{{BannerOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStage"/>
555555
<seeElementInDOM selector="{{BannerOnBackend.button('1')}}" stepKey="seeButtonInDOMStage"/>
556+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStage"/>
556557
<seeElement selector="{{BannerOnBackend.transparentOverlay('1')}}" stepKey="seeTransparentOverlayStage"/>
557558
<moveMouseOver selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="moveMouseOverBannerStage"/>
558559
<seeElement selector="{{BannerOnBackend.button('1')}}" stepKey="seeButtonOnHoverStage"/>
@@ -566,6 +567,7 @@
566567
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStorefront"/>
567568
<seeElement selector="{{BannerOnFrontend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStorefront"/>
568569
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
570+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
569571
<seeElement selector="{{BannerOnFrontend.transparentOverlay('1')}}" stepKey="seeTransparentOverlayStorefront"/>
570572
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
571573
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
@@ -576,6 +578,7 @@
576578
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStorefrontMobile"/>
577579
<seeElement selector="{{BannerOnFrontend.mobileBackgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorStorefrontMobile"/>
578580
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
581+
<dontSeeElement selector="{{BannerOnBackend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
579582
<seeElement selector="{{BannerOnFrontend.mobileTransparentOverlay('1')}}" stepKey="seeTransparentOverlayStorefrontMobile"/>
580583
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
581584
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
@@ -765,6 +768,7 @@
765768
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
766769
<!-- Validate Stage -->
767770
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
771+
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeAppearanceStage"/>
768772
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
769773
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
770774
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="seeBorderColorStage"/>
@@ -808,6 +812,7 @@
808812
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
809813
<!-- Validate Stage After Save -->
810814
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
815+
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeAppearanceStage2"/>
811816
<seeElement selector="{{BannerOnBackend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
812817
<seeElement selector="{{BannerOnBackend.border('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
813818
<seeElement selector="{{BannerOnBackend.borderColor('1', PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="seeBorderColorStage2"/>
@@ -851,6 +856,7 @@
851856
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
852857
<argument name="contentType" value="PageBuilderBannerContentType"/>
853858
</actionGroup>
859+
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeAppearanceStorefront"/>
854860
<seeElement selector="{{BannerOnFrontend.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
855861
<seeElementInDOM selector="{{BannerOnFrontend.alignmentMobile('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeInDOMMobileAlignmentStorefront"/>
856862
<dontSeeElement selector="{{BannerOnFrontend.alignmentMobile('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="dontSeeMobileAlignmentStorefront"/>

0 commit comments

Comments
 (0)