Skip to content

Commit 99bcb36

Browse files
dhaeckerdhaecker
committed
MC-13769: Add Missing P0-P1 MFTF Tests For PageBuilder On CMS Block - Render Content Through Block
 - Combining products actiongroups
1 parent 6f91ddf commit 99bcb36

File tree

3 files changed

+24
-29
lines changed

3 files changed

+24
-29
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="validateProductInProductsStage">
11+
<actionGroup name="validateProductInProducts">
1212
<arguments>
1313
<argument name="page" defaultValue="ProductsOnStage"/>
1414
<argument name="productsIndex" defaultValue="1" type="string"/>
@@ -20,6 +20,7 @@
2020
<seeElement selector="{{page.productImage(productIndex)}}" stepKey="seeProductImage"/>
2121
<seeElement selector="{{page.productName(productIndex, product.name)}}" stepKey="seeProductName"/>
2222
<seeElement selector="{{page.productPrice(productIndex, product.price)}}" stepKey="seeProductPrice"/>
23+
<moveMouseOver selector="{{page.productImage(productIndex)}}" stepKey="moveMouseOverProduct"/>
2324
<seeElement selector="{{page.productAddToCart(productIndex)}}" stepKey="seeProductAddToCart"/>
2425
<seeElement selector="{{page.productAddToWishList(productIndex)}}" stepKey="seeProductAddToWishList"/>
2526
<seeElement selector="{{page.productAddToCompare(productIndex)}}" stepKey="seeProductAddToCompare"/>
@@ -44,13 +45,6 @@
4445
<actualResult type="variable">getAddToComparePointerEvents</actualResult>
4546
</assertEquals>
4647
</actionGroup>
47-
<actionGroup name="validateProductInProductsStorefront" extends="validateProductInProductsStage">
48-
<arguments>
49-
<argument name="page" defaultValue="ProductsOnStorefront"/>
50-
<argument name="isClickable" defaultValue="auto" type="string"/>
51-
</arguments>
52-
<moveMouseOver selector="{{page.productImage(productIndex)}}" stepKey="moveMouseOverProduct" after="seeProductPrice"/>
53-
</actionGroup>
5448
<actionGroup name="validateProductCountInProducts">
5549
<arguments>
5650
<argument name="page" defaultValue=""/>

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<argument name="page" value="ProductsOnStage"/>
161161
<argument name="count" value="2"/>
162162
</actionGroup>
163-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsCMSBlockStage">
163+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsCMSBlockStage">
164164
<argument name="page" value="ProductsOnStage"/>
165165
</actionGroup>
166166
<!-- Add Block to CMS Page -->
@@ -187,9 +187,8 @@
187187
<argument name="page" value="ProductsOnStorefront"/>
188188
<argument name="count" value="2"/>
189189
</actionGroup>
190-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsCMSPageStage">
190+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsCMSPageStage">
191191
<argument name="page" value="ProductsOnStorefront"/>
192-
<argument name="isClickable" value="none"/>
193192
</actionGroup>
194193
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
195194
<!-- Validate CMS Page Storefront -->
@@ -201,7 +200,7 @@
201200
<argument name="page" value="ProductsOnStorefront"/>
202201
<argument name="count" value="2"/>
203202
</actionGroup>
204-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsCMSPageStorefront">
203+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsCMSPageStorefront">
205204
<argument name="page" value="ProductsOnStorefront"/>
206205
<argument name="isClickable" value="auto"/>
207206
</actionGroup>
@@ -300,7 +299,7 @@
300299
<argument name="page" value="ProductsOnStage"/>
301300
<argument name="count" value="1"/>
302301
</actionGroup>
303-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage">
302+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage">
304303
<argument name="page" value="ProductsOnStage"/>
305304
<argument name="product" value="SimpleProduct"/>
306305
</actionGroup>
@@ -331,10 +330,9 @@
331330
<argument name="page" value="ProductsOnStorefront"/>
332331
<argument name="count" value="1"/>
333332
</actionGroup>
334-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsStage2">
333+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage2">
335334
<argument name="page" value="ProductsOnStorefront"/>
336335
<argument name="product" value="SimpleProduct"/>
337-
<argument name="isClickable" value="none"/>
338336
</actionGroup>
339337
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
340338
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
@@ -344,10 +342,9 @@
344342
<argument name="page" value="ProductsOnStorefront"/>
345343
<argument name="count" value="1"/>
346344
</actionGroup>
347-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsStage3">
345+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage3">
348346
<argument name="page" value="ProductsOnStorefront"/>
349347
<argument name="product" value="SimpleProduct"/>
350-
<argument name="isClickable" value="none"/>
351348
</actionGroup>
352349
<!-- Validate Storefront with incorrect store view -->
353350
<comment userInput="Validate Storefront with incorrect Store View does not show product" stepKey="commentValidateStorefrontWithIncorrectStoreView"/>

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<argument name="page" value="ProductsOnStage"/>
112112
<argument name="count" value="2"/>
113113
</actionGroup>
114-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage">
114+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage">
115115
<argument name="page" value="ProductsOnStage"/>
116116
</actionGroup>
117117
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -123,8 +123,9 @@
123123
<argument name="page" value="ProductsOnStorefront"/>
124124
<argument name="count" value="2"/>
125125
</actionGroup>
126-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsStorefront">
126+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStorefront">
127127
<argument name="page" value="ProductsOnStorefront"/>
128+
<argument name="isClickable" value="auto"/>
128129
</actionGroup>
129130
</test>
130131
<test name="AdminPageBuilderProductsWithCount">
@@ -229,7 +230,7 @@
229230
<argument name="page" value="ProductsOnStage"/>
230231
<argument name="count" value="1"/>
231232
</actionGroup>
232-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage">
233+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage">
233234
<argument name="page" value="ProductsOnStage"/>
234235
</actionGroup>
235236
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
@@ -240,7 +241,7 @@
240241
<argument name="page" value="ProductsOnStage"/>
241242
<argument name="count" value="1"/>
242243
</actionGroup>
243-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStageAfterSave">
244+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStageAfterSave">
244245
<argument name="page" value="ProductsOnStage"/>
245246
</actionGroup>
246247
<!-- Validate Storefront -->
@@ -253,8 +254,9 @@
253254
<argument name="page" value="ProductsOnStorefront"/>
254255
<argument name="count" value="1"/>
255256
</actionGroup>
256-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsStorefront">
257+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStorefront">
257258
<argument name="page" value="ProductsOnStorefront"/>
259+
<argument name="isClickable" value="auto"/>
258260
</actionGroup>
259261
<!-- Switch Back To Backend -->
260262
<comment userInput="Switch Back To Backend" stepKey="commentSwitchToBackend"/>
@@ -277,7 +279,7 @@
277279
<argument name="page" value="ProductsOnStage"/>
278280
<argument name="count" value="4"/>
279281
</actionGroup>
280-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage2">
282+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage2">
281283
<argument name="page" value="ProductsOnStage"/>
282284
</actionGroup>
283285
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
@@ -288,7 +290,7 @@
288290
<argument name="page" value="ProductsOnStage"/>
289291
<argument name="count" value="4"/>
290292
</actionGroup>
291-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage2AfterSave">
293+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage2AfterSave">
292294
<argument name="page" value="ProductsOnStage"/>
293295
</actionGroup>
294296
<!-- Switch Back To Frontend -->
@@ -302,8 +304,9 @@
302304
<argument name="page" value="ProductsOnStorefront"/>
303305
<argument name="count" value="4"/>
304306
</actionGroup>
305-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsStorefront2">
307+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStorefront2">
306308
<argument name="page" value="ProductsOnStorefront"/>
309+
<argument name="isClickable" value="auto"/>
307310
</actionGroup>
308311
</test>
309312
<test name="AdminPageBuilderProductsConfigurationIsPersistent">
@@ -1424,7 +1427,7 @@
14241427
<argument name="page" value="ProductsOnStage"/>
14251428
<argument name="count" value="1"/>
14261429
</actionGroup>
1427-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage">
1430+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage">
14281431
<argument name="page" value="ProductsOnStage"/>
14291432
<argument name="product" value="SimpleProduct"/>
14301433
</actionGroup>
@@ -1436,7 +1439,7 @@
14361439
<argument name="page" value="ProductsOnStage"/>
14371440
<argument name="count" value="1"/>
14381441
</actionGroup>
1439-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage2">
1442+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage2">
14401443
<argument name="page" value="ProductsOnStage"/>
14411444
<argument name="product" value="SimpleProduct"/>
14421445
</actionGroup>
@@ -1576,7 +1579,7 @@
15761579
<argument name="page" value="ProductsOnStage"/>
15771580
<argument name="count" value="1"/>
15781581
</actionGroup>
1579-
<actionGroup ref="validateProductInProductsStage" stepKey="validateProductsStage1">
1582+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStage1">
15801583
<argument name="page" value="ProductsOnStage"/>
15811584
</actionGroup>
15821585
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
@@ -1590,8 +1593,9 @@
15901593
<argument name="page" value="ProductsOnStorefront"/>
15911594
<argument name="count" value="1"/>
15921595
</actionGroup>
1593-
<actionGroup ref="validateProductInProductsStorefront" stepKey="validateProductsStorefront">
1596+
<actionGroup ref="validateProductInProducts" stepKey="validateProductsStorefront">
15941597
<argument name="page" value="ProductsOnStorefront"/>
1598+
<argument name="isClickable" value="auto"/>
15951599
</actionGroup>
15961600
<!-- Changing Combination Condition to False -->
15971601
<comment userInput="Changing Combination Condition to False" stepKey="commentChangeCombinationConditionToFalse"/>

0 commit comments

Comments
 (0)