Skip to content

Commit 81c2f87

Browse files
committed
#558: Developer can style content types output differently per viewport
- Name & filename changed to ValidateContentTypesStyleEqualsExpectedStyleActionGroup - References to ValidateContentTypesStyleEqualsExpectedStyleActionGroup are changed
1 parent 8a48ba1 commit 81c2f87

File tree

144 files changed

+1090
-1090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1090
-1090
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypeStylesActionGroup.xml renamed to app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9-
<actionGroup name="ValidateContentTypeStylesActionGroup">
9+
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
1010
<annotations>
1111
<description>Validate styles</description>
1212
</annotations>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@
6464
<!-- Validate CMS Page Stage -->
6565
<comment userInput="Validate CMS Page Stage" stepKey="commentValidateCMSPageStage" after="saveEditPanelSettings"/>
6666
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="3" stepKey="see3RowsCMSPageStage" after="commentValidateCMSPageStage"/>
67-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRowCMSPageStage" after="see3RowsCMSPageStage">
67+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowCMSPageStage" after="see3RowsCMSPageStage">
6868
<argument name="selector" value="{{RowOnStorefront.backgroundPath('3')}}"/>
6969
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
7070
<argument name="cssProperty" value="backgroundColor"/>
7171
</actionGroup>
7272
<seeNumberOfElements selector="{{ColumnOnFrontend.allColumns}}" userInput="2" stepKey="see2ColumnsCMSPageStage" after="seeBackgroundColorRowCMSPageStage"/>
73-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorColumnCMSPageStage" after="see2ColumnsCMSPageStage">
73+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorColumnCMSPageStage" after="see2ColumnsCMSPageStage">
7474
<argument name="selector" value="{{ColumnOnFrontend.backgroundPath('2')}}"/>
7575
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_White.rgb}}"/>
7676
<argument name="cssProperty" value="backgroundColor"/>
7777
</actionGroup>
78-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide1CMSPageStage" after="seeBackgroundColorColumnCMSPageStage">
78+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide1CMSPageStage" after="seeBackgroundColorColumnCMSPageStage">
7979
<argument name="selector" value="{{SlideOnFrontend.backgroundPath('1')}}"/>
8080
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
8181
<argument name="cssProperty" value="backgroundColor"/>
@@ -88,7 +88,7 @@
8888
</actionGroup>
8989
<comment userInput="---merging to remove step---" stepKey="scrollToProductDescription"/>
9090
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="3" stepKey="see2RowsStorefront"/>
91-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRowStorefront">
91+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStorefront">
9292
<argument name="selector" value="{{RowOnStorefront.backgroundPath('3')}}"/>
9393
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
9494
<argument name="cssProperty" value="backgroundColor"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@
6767
</actionGroup>
6868
<comment userInput="---merging to remove step---" stepKey="scrollToProductDescription"/>
6969
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="3" stepKey="see2RowsStorefront"/>
70-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow1Storefront">
70+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow1Storefront">
7171
<argument name="selector" value="{{RowOnStorefront.backgroundPath('2')}}"/>
7272
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
7373
<argument name="cssProperty" value="backgroundColor"/>
7474
</actionGroup>
75-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow2Storefront">
75+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow2Storefront">
7676
<argument name="selector" value="{{RowOnStorefront.backgroundPath('3')}}"/>
7777
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
7878
<argument name="cssProperty" value="backgroundColor"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<argument name="page" value="$$createCMSPage.identifier$$"/>
6868
</actionGroup>
6969
<comment userInput="---merging to remove step---" stepKey="scrollToProductDescription"/>
70-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRowStorefront">
70+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStorefront">
7171
<argument name="selector" value="{{RowOnStorefront.backgroundPath('2')}}"/>
7272
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
7373
<argument name="cssProperty" value="backgroundColor"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductAddAndEditRowColumnSlideTest.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,26 +114,26 @@
114114
<!-- Validate Stage -->
115115
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
116116
<seeNumberOfElements selector="{{RowOnStage.allRows}}" userInput="2" stepKey="see2RowsStage"/>
117-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRowStage">
117+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStage">
118118
<argument name="selector" value="{{RowOnStage.backgroundPath('2')}}"/>
119119
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
120120
<argument name="cssProperty" value="backgroundColor"/>
121121
</actionGroup>
122122
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="2" stepKey="see2ColumnsStage"/>
123-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorColumnStage">
123+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorColumnStage">
124124
<argument name="selector" value="{{ColumnOnBackend.backgroundPath('2')}}"/>
125125
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_White.rgb}}"/>
126126
<argument name="cssProperty" value="backgroundColor"/>
127127
</actionGroup>
128-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide2Stage">
128+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide2Stage">
129129
<argument name="selector" value="{{SlideOnBackend.backgroundPath('2')}}"/>
130130
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_RGB_Blue.rgb}}"/>
131131
<argument name="cssProperty" value="backgroundColor"/>
132132
</actionGroup>
133133
<actionGroup ref="switchSlide" stepKey="switchSlideStage">
134134
<argument name="slideIndex" value="1"/>
135135
</actionGroup>
136-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide1Stage">
136+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide1Stage">
137137
<argument name="selector" value="{{SlideOnBackend.backgroundPath('1')}}"/>
138138
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
139139
<argument name="cssProperty" value="backgroundColor"/>
@@ -148,26 +148,26 @@
148148
<!-- Validate Stage After Save -->
149149
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
150150
<seeNumberOfElements selector="{{RowOnStage.allRows}}" userInput="2" stepKey="see2RowsStageAfterSave"/>
151-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRowStageAfterSave">
151+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStageAfterSave">
152152
<argument name="selector" value="{{RowOnStage.backgroundPath('2')}}"/>
153153
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
154154
<argument name="cssProperty" value="backgroundColor"/>
155155
</actionGroup>
156156
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="2" stepKey="see2ColumnsStageAfterSave"/>
157-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorColumnStageAfterSave">
157+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorColumnStageAfterSave">
158158
<argument name="selector" value="{{ColumnOnBackend.backgroundPath('2')}}"/>
159159
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_White.rgb}}"/>
160160
<argument name="cssProperty" value="backgroundColor"/>
161161
</actionGroup>
162-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide1StageAfterSave">
162+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide1StageAfterSave">
163163
<argument name="selector" value="{{SlideOnBackend.backgroundPath('1')}}"/>
164164
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
165165
<argument name="cssProperty" value="backgroundColor"/>
166166
</actionGroup>
167167
<actionGroup ref="switchSlide" stepKey="switchSlideStageAfterSave">
168168
<argument name="slideIndex" value="2"/>
169169
</actionGroup>
170-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide2StageAfterSave">
170+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide2StageAfterSave">
171171
<argument name="selector" value="{{SlideOnBackend.backgroundPath('2')}}"/>
172172
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_RGB_Blue.rgb}}"/>
173173
<argument name="cssProperty" value="backgroundColor"/>
@@ -179,18 +179,18 @@
179179
</actionGroup>
180180
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription"/>
181181
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="2" stepKey="see2RowsStorefront"/>
182-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRowStorefront">
182+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStorefront">
183183
<argument name="selector" value="{{RowOnStorefront.backgroundPath('2')}}"/>
184184
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
185185
<argument name="cssProperty" value="backgroundColor"/>
186186
</actionGroup>
187187
<seeNumberOfElements selector="{{ColumnOnFrontend.allColumns}}" userInput="2" stepKey="see2ColumnsStorefront"/>
188-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorColumnStorefront">
188+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorColumnStorefront">
189189
<argument name="selector" value="{{ColumnOnFrontend.backgroundPath('2')}}"/>
190190
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_White.rgb}}"/>
191191
<argument name="cssProperty" value="backgroundColor"/>
192192
</actionGroup>
193-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide1Storefront">
193+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide1Storefront">
194194
<argument name="selector" value="{{SlideOnFrontend.backgroundPath('1')}}"/>
195195
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
196196
<argument name="cssProperty" value="backgroundColor"/>
@@ -200,7 +200,7 @@
200200
<argument name="slideSection" value="SlideOnFrontend"/>
201201
<argument name="slideIndex" value="2"/>
202202
</actionGroup>
203-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlide2Storefront">
203+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlide2Storefront">
204204
<argument name="selector" value="{{SlideOnFrontend.backgroundPath('2')}}"/>
205205
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_RGB_Blue.rgb}}"/>
206206
<argument name="cssProperty" value="backgroundColor"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
<argument name="contentType" value="PageBuilderRowContentType"/>
5555
</actionGroup>
5656
<seeNumberOfElements selector="{{RowOnStage.allRows}}" userInput="2" stepKey="see2RowsStage"/>
57-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow1Stage">
57+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow1Stage">
5858
<argument name="selector" value="{{RowOnStage.backgroundPath('1')}}"/>
5959
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
6060
<argument name="cssProperty" value="backgroundColor"/>
6161
</actionGroup>
62-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow2Stage">
62+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow2Stage">
6363
<argument name="selector" value="{{RowOnStage.backgroundPath('2')}}"/>
6464
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
6565
<argument name="cssProperty" value="backgroundColor"/>
@@ -84,12 +84,12 @@
8484
<!-- Validate Stage After Save -->
8585
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
8686
<seeNumberOfElements selector="{{RowOnStage.allRows}}" userInput="2" stepKey="see2RowsStageAfterSave"/>
87-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow1StageAfterSave">
87+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow1StageAfterSave">
8888
<argument name="selector" value="{{RowOnStage.backgroundPath('1')}}"/>
8989
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
9090
<argument name="cssProperty" value="backgroundColor"/>
9191
</actionGroup>
92-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow2StageAfterSave">
92+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow2StageAfterSave">
9393
<argument name="selector" value="{{RowOnStage.backgroundPath('2')}}"/>
9494
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
9595
<argument name="cssProperty" value="backgroundColor"/>
@@ -101,12 +101,12 @@
101101
</actionGroup>
102102
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription"/>
103103
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="2" stepKey="see2RowsStorefront"/>
104-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow1Storefront">
104+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow1Storefront">
105105
<argument name="selector" value="{{RowOnStorefront.backgroundPath('1')}}"/>
106106
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
107107
<argument name="cssProperty" value="backgroundColor"/>
108108
</actionGroup>
109-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorRow2Storefront">
109+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRow2Storefront">
110110
<argument name="selector" value="{{RowOnStorefront.backgroundPath('2')}}"/>
111111
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
112112
<argument name="cssProperty" value="backgroundColor"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditFormForSlide"/>
6060
<!-- Validate Stage -->
6161
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
62-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlideStage">
62+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlideStage">
6363
<argument name="selector" value="{{SlideOnBackend.backgroundPath('1')}}"/>
6464
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
6565
<argument name="cssProperty" value="backgroundColor"/>
@@ -73,7 +73,7 @@
7373
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription"/>
7474
<!-- Validate Stage After Save -->
7575
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
76-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlideStageAfterSave">
76+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlideStageAfterSave">
7777
<argument name="selector" value="{{SlideOnBackend.backgroundPath('1')}}"/>
7878
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
7979
<argument name="cssProperty" value="backgroundColor"/>
@@ -92,7 +92,7 @@
9292
<argument name="page" value="$$createProduct.name$$.html"/>
9393
</actionGroup>
9494
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription"/>
95-
<actionGroup ref="ValidateContentTypeStylesActionGroup" stepKey="seeBackgroundColorSlideStorefront">
95+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorSlideStorefront">
9696
<argument name="selector" value="{{SlideOnFrontend.backgroundPath('1')}}"/>
9797
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Plaintext_Green.rgb}}"/>
9898
<argument name="cssProperty" value="backgroundColor"/>

0 commit comments

Comments
 (0)