Skip to content

Commit 8badc2c

Browse files
davemacaulaydavemacaulay
committed
Merge branch '1.1-develop' into PB-46
2 parents f9d2d4b + f006d21 commit 8badc2c

File tree

25 files changed

+5224
-601
lines changed

25 files changed

+5224
-601
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# CODEOWNERS file for /docs/ folder.
22
# Forces a review from other writers for anything within /docs/.
3-
/docs/ @magento/devdocs-admins
3+
/docs/ @bdenham

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup.xml

Lines changed: 326 additions & 2 deletions
Large diffs are not rendered by default.

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,9 @@
148148
<click selector="{{section.textArea(index)}}" stepKey="clickEditor"/>
149149
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
150150
</actionGroup>
151+
<actionGroup name="switchTabAndReloadPage">
152+
<switchToNextTab stepKey="switchToNextTab"/>
153+
<reloadPage stepKey="reloadPage"/>
154+
<waitForPageLoad stepKey="waitForPageLoad"/>
155+
</actionGroup>
151156
</actionGroups>

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

Lines changed: 114 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -104,121 +104,217 @@
104104
<data key="value">position_by_sku</data>
105105
</entity>
106106
<!-- Number of Products to Display: Grid Appearance -->
107-
<entity name="PageBuilderProductsCountPropertyOne" type="pagebuilder_content_type">
107+
<entity name="PageBuilderProductsCountPropertyOne" type="pagebuilder_products_grid_number_of_products">
108108
<data key="name">Number of Products to Display</data>
109109
<data key="section">appearance_fieldset</data>
110110
<data key="fieldName">products_count</data>
111111
<data key="value">1</data>
112112
</entity>
113-
<entity name="PageBuilderProductsCountPropertyTwo" type="pagebuilder_content_type">
113+
<entity name="PageBuilderProductsCountPropertyTwo" type="pagebuilder_products_grid_number_of_products">
114114
<data key="name">Number of Products to Display</data>
115115
<data key="section">appearance_fieldset</data>
116116
<data key="fieldName">products_count</data>
117117
<data key="value">2</data>
118118
</entity>
119-
<entity name="PageBuilderProductsCountPropertyFour" type="pagebuilder_content_type">
119+
<entity name="PageBuilderProductsCountPropertyFour" type="pagebuilder_products_grid_number_of_products">
120120
<data key="name">Number of Products to Display</data>
121121
<data key="section">appearance_fieldset</data>
122122
<data key="fieldName">products_count</data>
123123
<data key="value">4</data>
124124
</entity>
125-
<entity name="PageBuilderProductsCountPropertyFive" type="pagebuilder_content_type">
125+
<entity name="PageBuilderProductsCountPropertyFive" type="pagebuilder_products_grid_number_of_products">
126126
<data key="name">Number of Products to Display</data>
127127
<data key="section">appearance_fieldset</data>
128128
<data key="fieldName">products_count</data>
129129
<data key="value">5</data>
130130
</entity>
131-
<entity name="PageBuilderProductsCountPropertyMax" type="pagebuilder_content_type">
131+
<entity name="PageBuilderProductsCountPropertyMax" type="pagebuilder_products_grid_number_of_products">
132132
<data key="name">Number of Products to Display</data>
133133
<data key="section">appearance_fieldset</data>
134134
<data key="fieldName">products_count</data>
135135
<data key="value">999</data>
136136
</entity>
137-
<entity name="PageBuilderProductsInvalidMinCountProperty" type="pagebuilder_content_type">
137+
<entity name="PageBuilderProductsInvalidMinCountProperty" type="pagebuilder_products_grid_number_of_products">
138138
<data key="name">Number of Products to Display</data>
139139
<data key="section">appearance_fieldset</data>
140140
<data key="fieldName">products_count</data>
141141
<data key="value">0</data>
142142
<data key="errorMessage">Please enter a value greater than or equal to 1.</data>
143143
</entity>
144-
<entity name="PageBuilderProductsInvalidMaxCountProperty" type="pagebuilder_content_type">
144+
<entity name="PageBuilderProductsInvalidMaxCountProperty" type="pagebuilder_products_grid_number_of_products">
145145
<data key="name">Number of Products to Display</data>
146146
<data key="section">appearance_fieldset</data>
147147
<data key="fieldName">products_count</data>
148148
<data key="value">1000</data>
149149
<data key="errorMessage">Please enter a value less than or equal to 999.</data>
150150
</entity>
151-
<entity name="PageBuilderProductsInvalidTypeCountProperty" type="pagebuilder_content_type">
151+
<entity name="PageBuilderProductsInvalidTypeCountProperty" type="pagebuilder_products_grid_number_of_products">
152152
<data key="name">Number of Products to Display</data>
153153
<data key="section">appearance_fieldset</data>
154154
<data key="fieldName">products_count</data>
155155
<data key="value">Invalid</data>
156156
<data key="errorMessage">Please enter a valid number in this field.</data>
157157
</entity>
158-
<entity name="PageBuilderProductsInvalidEmptyCountProperty" type="pagebuilder_content_type">
158+
<entity name="PageBuilderProductsInvalidEmptyCountProperty" type="pagebuilder_products_grid_number_of_products">
159159
<data key="name">Number of Products to Display</data>
160160
<data key="section">appearance_fieldset</data>
161161
<data key="fieldName">products_count</data>
162162
<data key="value"/>
163163
<data key="errorMessage">This is a required field.</data>
164164
</entity>
165165
<!-- Number of Products to Display: Carousel Appearance -->
166-
<entity name="PageBuilderProductsCarouselCountPropertyOne" type="pagebuilder_content_type">
166+
<entity name="PageBuilderProductsCarouselCountPropertyOne" type="pagebuilder_products_carousel_number_of_products">
167167
<data key="name">Number of Products to Display</data>
168168
<data key="section">appearance_fieldset</data>
169169
<data key="fieldName">carousel_products_count</data>
170170
<data key="value">1</data>
171171
</entity>
172-
<entity name="PageBuilderProductsCarouselCountPropertyTwo" type="pagebuilder_content_type">
172+
<entity name="PageBuilderProductsCarouselCountPropertyTwo" type="pagebuilder_products_carousel_number_of_products">
173173
<data key="name">Number of Products to Display</data>
174174
<data key="section">appearance_fieldset</data>
175175
<data key="fieldName">carousel_products_count</data>
176176
<data key="value">2</data>
177177
</entity>
178-
<entity name="PageBuilderProductsCarouselCountPropertyFour" type="pagebuilder_content_type">
178+
<entity name="PageBuilderProductsCarouselCountPropertyThree" type="pagebuilder_products_carousel_number_of_products">
179+
<data key="name">Number of Products to Display</data>
180+
<data key="section">appearance_fieldset</data>
181+
<data key="fieldName">carousel_products_count</data>
182+
<data key="value">3</data>
183+
</entity>
184+
<entity name="PageBuilderProductsCarouselCountPropertyFour" type="pagebuilder_products_carousel_number_of_products">
179185
<data key="name">Number of Products to Display</data>
180186
<data key="section">appearance_fieldset</data>
181187
<data key="fieldName">carousel_products_count</data>
182188
<data key="value">4</data>
183189
</entity>
184-
<entity name="PageBuilderProductsCarouselCountPropertyTwenty" type="pagebuilder_content_type">
190+
<entity name="PageBuilderProductsCarouselCountPropertyFive" type="pagebuilder_products_carousel_number_of_products">
191+
<data key="name">Number of Products to Display</data>
192+
<data key="section">appearance_fieldset</data>
193+
<data key="fieldName">carousel_products_count</data>
194+
<data key="value">5</data>
195+
</entity>
196+
<entity name="PageBuilderProductsCarouselCountPropertyTwenty" type="pagebuilder_products_carousel_number_of_products">
185197
<data key="name">Number of Products to Display</data>
186198
<data key="section">appearance_fieldset</data>
187199
<data key="fieldName">carousel_products_count</data>
188200
<data key="value">20</data>
189201
</entity>
190-
<entity name="PageBuilderProductsCarouselCountPropertyMax" type="pagebuilder_content_type">
202+
<entity name="PageBuilderProductsCarouselCountPropertyMax" type="pagebuilder_products_carousel_number_of_products">
191203
<data key="name">Number of Products to Display</data>
192204
<data key="section">appearance_fieldset</data>
193205
<data key="fieldName">carousel_products_count</data>
194206
<data key="value">999</data>
195207
</entity>
196-
<entity name="PageBuilderProductsCarouselInvalidMinCountProperty" type="pagebuilder_content_type">
208+
<entity name="PageBuilderProductsCarouselInvalidMinCountProperty" type="pagebuilder_products_carousel_number_of_products">
197209
<data key="name">Number of Products to Display</data>
198210
<data key="section">appearance_fieldset</data>
199211
<data key="fieldName">carousel_products_count</data>
200212
<data key="value">0</data>
201213
<data key="errorMessage">Please enter a value greater than or equal to 1.</data>
202214
</entity>
203-
<entity name="PageBuilderProductsCarouselInvalidMaxCountProperty" type="pagebuilder_content_type">
215+
<entity name="PageBuilderProductsCarouselInvalidMaxCountProperty" type="pagebuilder_products_carousel_number_of_products">
204216
<data key="name">Number of Products to Display</data>
205217
<data key="section">appearance_fieldset</data>
206218
<data key="fieldName">carousel_products_count</data>
207219
<data key="value">1000</data>
208220
<data key="errorMessage">Please enter a value less than or equal to 999.</data>
209221
</entity>
210-
<entity name="PageBuilderProductsCarouselInvalidTypeCountProperty" type="pagebuilder_content_type">
222+
<entity name="PageBuilderProductsCarouselInvalidTypeCountProperty" type="pagebuilder_products_carousel_number_of_products">
211223
<data key="name">Number of Products to Display</data>
212224
<data key="section">appearance_fieldset</data>
213225
<data key="fieldName">carousel_products_count</data>
214226
<data key="value">Invalid</data>
215227
<data key="errorMessage">Please enter a valid number in this field.</data>
216228
</entity>
217-
<entity name="PageBuilderProductsCarouselInvalidEmptyCountProperty" type="pagebuilder_content_type">
229+
<entity name="PageBuilderProductsCarouselInvalidEmptyCountProperty" type="pagebuilder_products_carousel_number_of_products">
218230
<data key="name">Number of Products to Display</data>
219231
<data key="section">appearance_fieldset</data>
220232
<data key="fieldName">carousel_products_count</data>
221233
<data key="value"/>
222234
<data key="errorMessage">This is a required field.</data>
223235
</entity>
236+
<!-- Carousel Settings: Carousel Mode -->
237+
<entity name="PageBuilderProductsCarouselSettingsCarouselMode_Default" type="pagebuilder_products_carousel_mode">
238+
<data key="name">Autoplay</data>
239+
<data key="section">settings</data>
240+
<data key="fieldName">carousel_mode</data>
241+
<data key="value">default</data>
242+
</entity>
243+
<entity name="PageBuilderProductsCarouselSettingsCarouselMode_Continuous" type="pagebuilder_products_carousel_mode">
244+
<data key="name">Autoplay</data>
245+
<data key="section">settings</data>
246+
<data key="fieldName">carousel_mode</data>
247+
<data key="value">continuous</data>
248+
</entity>
249+
<!-- Carousel Settings: Autoplay -->
250+
<entity name="PageBuilderProductsCarouselSettingsAutoplay_Enabled" type="pagebuilder_products_carousel_autoplay">
251+
<data key="name">Autoplay</data>
252+
<data key="section">settings</data>
253+
<data key="fieldName">autoplay</data>
254+
<data key="value">true</data>
255+
</entity>
256+
<entity name="PageBuilderProductsCarouselSettingsAutoplay_Disabled" type="pagebuilder_products_carousel_autoplay">
257+
<data key="name">Autoplay</data>
258+
<data key="section">settings</data>
259+
<data key="fieldName">autoplay</data>
260+
<data key="value">false</data>
261+
</entity>
262+
<!-- Carousel Settings: Autoplay Speed -->
263+
<entity name="PageBuilderProductsCarouselSettingsAutoplaySpeed_4000" type="pagebuilder_products_carousel_autoplay_speed">
264+
<data key="name">Autoplay Speed</data>
265+
<data key="section">settings</data>
266+
<data key="fieldName">autoplay_speed</data>
267+
<data key="value">4000</data>
268+
</entity>
269+
<entity name="PageBuilderProductsCarouselSettingsAutoplaySpeed_10000" type="pagebuilder_products_carousel_autoplay_speed">
270+
<data key="name">Autoplay Speed</data>
271+
<data key="section">settings</data>
272+
<data key="fieldName">autoplay_speed</data>
273+
<data key="value">10000</data>
274+
</entity>
275+
<entity name="PageBuilderProductsCarouselSettingsAutoplaySpeed_50000" type="pagebuilder_products_carousel_autoplay_speed">
276+
<data key="name">Autoplay Speed</data>
277+
<data key="section">settings</data>
278+
<data key="fieldName">autoplay_speed</data>
279+
<data key="value">50000</data>
280+
</entity>
281+
<!-- Carousel Settings: Infinite Loop -->
282+
<entity name="PageBuilderProductsCarouselSettingsInfiniteLoop_Enabled" type="pagebuilder_products_carousel_infinite_loop">
283+
<data key="name">Autoplay</data>
284+
<data key="section">settings</data>
285+
<data key="fieldName">is_infinite</data>
286+
<data key="value">true</data>
287+
</entity>
288+
<entity name="PageBuilderProductsCarouselSettingsInfiniteLoop_Disabled" type="pagebuilder_products_carousel_infinite_loop">
289+
<data key="name">Autoplay</data>
290+
<data key="section">settings</data>
291+
<data key="fieldName">is_infinite</data>
292+
<data key="value">false</data>
293+
</entity>
294+
<!-- Carousel Settings: Show Arrows -->
295+
<entity name="PageBuilderProductsCarouselSettingsShowArrows_Enabled" type="pagebuilder_products_carousel_show_arrows">
296+
<data key="name">Autoplay</data>
297+
<data key="section">settings</data>
298+
<data key="fieldName">show_arrows</data>
299+
<data key="value">true</data>
300+
</entity>
301+
<entity name="PageBuilderProductsCarouselSettingsShowArrows_Disabled" type="pagebuilder_products_carousel_show_arrows">
302+
<data key="name">Autoplay</data>
303+
<data key="section">settings</data>
304+
<data key="fieldName">show_arrows</data>
305+
<data key="value">false</data>
306+
</entity>
307+
<!-- Carousel Settings: Show Dots -->
308+
<entity name="PageBuilderProductsCarouselSettingsShowDots_Enabled" type="pagebuilder_products_carousel_show_dots">
309+
<data key="name">Autoplay</data>
310+
<data key="section">settings</data>
311+
<data key="fieldName">show_dots</data>
312+
<data key="value">true</data>
313+
</entity>
314+
<entity name="PageBuilderProductsCarouselSettingsShowDots_Disabled" type="pagebuilder_products_carousel_show_dots">
315+
<data key="name">Autoplay</data>
316+
<data key="section">settings</data>
317+
<data key="fieldName">show_dots</data>
318+
<data key="value">false</data>
319+
</entity>
224320
</entities>

0 commit comments

Comments
 (0)