Skip to content

Commit d087352

Browse files
petrovsapetrovsa
committed
Merge remote-tracking branch 'origin/558_7_content-type-style-attribute-removal' into 558_7_content-type-style-attribute-removal
2 parents 2150254 + fbb9f8a commit d087352

File tree

33 files changed

+245
-245
lines changed

33 files changed

+245
-245
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6565
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
6666
</actionGroup>
67-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
67+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6868
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6969
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
7070
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -75,7 +75,7 @@
7575
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7676
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
7777
</actionGroup>
78-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
78+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7979
<!-- Edit Panel: Check Background Attachment -->
8080
<comment userInput="Edit Panel: Check Background Attachment" stepKey="commentValidateEditPanel"/>
8181
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -95,7 +95,7 @@
9595
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9696
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
9797
</actionGroup>
98-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
98+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9999
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
100100
<!-- Storefront: Check Background Attachment Mobile -->
101101
<comment userInput="Storefront: Check Background Attachment Mobile" stepKey="commentStorefrontCheckMobile"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Scroll"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Scroll"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Attachment -->
7979
<comment userInput="Edit Panel: Check Background Attachment" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Scroll"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomCenterTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomCenter"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomCenter"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomCenter"/>
9595
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomLeftTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomLeft"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomLeft"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomLeft"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomRightTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomRight"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomRight"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_BottomRight"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterLeftTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_CenterLeft"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_CenterLeft"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_CenterLeft"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterRightTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_CenterRight"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_CenterRight"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_CenterRight"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_Center"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_Center"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_Center"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopCenterTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopCenter"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopCenter"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopCenter"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopLeftTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6464
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopLeft"/>
6565
</actionGroup>
66-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage1"/>
66+
<comment userInput="BIC workaround" stepKey="validateImageStage1"/>
6767
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6868
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
6969
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -74,7 +74,7 @@
7474
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
7575
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopLeft"/>
7676
</actionGroup>
77-
<comment userInput="Image validation performed in action group above" stepKey="validateImageStage2"/>
77+
<comment userInput="BIC workaround" stepKey="validateImageStage2"/>
7878
<!-- Edit Panel: Check Background Position -->
7979
<comment userInput="Edit Panel: Check Background Position" stepKey="commentValidateEditPanel"/>
8080
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
@@ -94,6 +94,6 @@
9494
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
9595
<argument name="backgroundPosition" value="PageBuilderBackgroundPosition_TopLeft"/>
9696
</actionGroup>
97-
<comment userInput="Image validation performed in action group above" stepKey="validateImageOnStorefront"/>
97+
<comment userInput="BIC workaround" stepKey="validateImageOnStorefront"/>
9898
</test>
9999
</tests>

0 commit comments

Comments
 (0)