Skip to content

Commit 6606027

Browse files
author
joiecaquicla
committed
magento2/magento2-page-builder#702: Automate MC-3317, MC-15481, MC-15482 - automate MC-3317
1 parent dc96d03 commit 6606027

File tree

2 files changed

+93
-18
lines changed

2 files changed

+93
-18
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontProductFullWidthSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<element name="attributes" type="button" selector=".page-main-pagebuilder-attributes"/>
1313
<element name="moreInformation" type="button" selector=".additional-attributes-wrapper"/>
1414
<element name="infoMain" type="button" selector=".product-info-main"/>
15+
<element name="shortDescription" type="button" selector=".product-info-main div.product.attribute.overview div.value"/>
1516
<element name="media" type="button" selector=".product.media"/>
1617
<element name="reviews" type="button" selector=".block.review-add"/>
1718
<element name="related" type="button" selector=".block.related"/>

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

Lines changed: 92 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<requiredEntity createDataKey="createPreReqCategory"/>
4444
</createData>
4545
<createData stepKey="createPageBuilderAttribute" entity="productAttributePageBuilder"/>
46+
<resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
4647
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
4748
</before>
4849
<after>
@@ -222,7 +223,7 @@
222223
<!-- Add Product Image -->
223224
<actionGroup ref="AddProductImageActionGroup" stepKey="addProductImage"/>
224225

225-
<!-- Add Related Products, Up-Sells, and Cross-Sells -->
226+
<!-- Add Related Products and Up-Sells -->
226227
<actionGroup ref="AddRelatedProductBySkuActionGroup" stepKey="addRelatedProduct1">
227228
<argument name="sku" value="$$createProduct1.sku$$"/>
228229
</actionGroup>
@@ -237,6 +238,10 @@
237238
<argument name="sku" value="$$createProduct4.sku$$"/>
238239
</actionGroup>
239240

241+
<!-- Save product after adding related and upsell -->
242+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
243+
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="verifySaveMessageSuccessIsShown"/>
244+
240245
<actionGroup ref="AddCrossSellProductBySkuActionGroup" stepKey="addCrossSellProduct1">
241246
<argument name="sku" value="$$createProduct5.sku$$"/>
242247
</actionGroup>
@@ -250,29 +255,98 @@
250255
<argument name="layoutOption" value="PageBuilderFullWidthLayout.product"/>
251256
</actionGroup>
252257

253-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
254-
<waitForPageLoad stepKey="waitForPageLoadSaveProduct"/>
255-
<waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
258+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
259+
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="verifySaveMessageSuccessIsShown2"/>
256260

257261
<!-- Validate in Storefront - Full screen -->
258262
<amOnPage url="{{SimpleProduct.name}}.html" stepKey="navigateToProductPage"/>
259263
<waitForPageLoad stepKey="waitForPageLoad1"/>
260264

261-
<!-- Assert product content -->
262-
<see selector="{{StorefrontProductInfoMainSection.productShortDescription}}" userInput="{{PageBuilderHeadingTextSample2.value}}" stepKey="seeShortDescriptionStorefront"/>
263-
<see selector="{{StorefrontProductInfoMainSection.productDescription}}" userInput="{{PageBuilderHeadingTextSample1.value}}" stepKey="seeLongDescriptionStorefront"/>
264-
<actionGroup ref="AssertStorefrontCustomProductAttributeActionGroup" stepKey="verifyCustomAttribute">
265-
<argument name="attributeLabel" value="{{productAttributePageBuilder.frontend_label}}"/>
266-
<argument name="attributeValue" value="{{PageBuilderHeadingTextSample3.value}}"/>
267-
</actionGroup>
265+
<!-- Assert sections on page are in correct order -->
266+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.shortDescription}}')[0].getBoundingClientRect().y" stepKey="shortDescriptionPosition"/>
267+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.description}}')[0].getBoundingClientRect().y" stepKey="descriptionPosition"/>
268+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.attributes}}')[0].getBoundingClientRect().y" stepKey="attributesPosition"/>
269+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.related}}')[0].getBoundingClientRect().y" stepKey="relatedPosition"/>
270+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.upsell}}')[0].getBoundingClientRect().y" stepKey="upsellPosition"/>
271+
272+
<assertGreaterThan stepKey="assertDescriptionBelowShortDescription">
273+
<expectedResult type="variable">shortDescriptionPosition</expectedResult>
274+
<actualResult type="variable">descriptionPosition</actualResult>
275+
</assertGreaterThan>
276+
277+
<assertGreaterThan stepKey="assertAttributesBelowDescription">
278+
<expectedResult type="variable">descriptionPosition</expectedResult>
279+
<actualResult type="variable">attributesPosition</actualResult>
280+
</assertGreaterThan>
281+
282+
<assertGreaterThan stepKey="assertRelatedBelowAttributes">
283+
<expectedResult type="variable">attributesPosition</expectedResult>
284+
<actualResult type="variable">relatedPosition</actualResult>
285+
</assertGreaterThan>
286+
287+
<assertGreaterThan stepKey="assertUpsellBelowRelated">
288+
<expectedResult type="variable">relatedPosition</expectedResult>
289+
<actualResult type="variable">upsellPosition</actualResult>
290+
</assertGreaterThan>
291+
292+
<!-- Validate in Storefront - 1600px width -->
293+
<resizeWindow width="1600" height="1024" stepKey="resizeWindowWidth"/>
294+
295+
<!-- Assert sections on page are in correct order -->
296+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.shortDescription}}')[0].getBoundingClientRect().y" stepKey="shortDescriptionPosition1"/>
297+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.description}}')[0].getBoundingClientRect().y" stepKey="descriptionPosition1"/>
298+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.attributes}}')[0].getBoundingClientRect().y" stepKey="attributesPosition1"/>
299+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.related}}')[0].getBoundingClientRect().y" stepKey="relatedPosition1"/>
300+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.upsell}}')[0].getBoundingClientRect().y" stepKey="upsellPosition1"/>
301+
302+
<assertGreaterThan stepKey="assertDescriptionBelowShortDescription1">
303+
<expectedResult type="variable">shortDescriptionPosition1</expectedResult>
304+
<actualResult type="variable">descriptionPosition1</actualResult>
305+
</assertGreaterThan>
306+
307+
<assertGreaterThan stepKey="assertAttributesBelowDescription1">
308+
<expectedResult type="variable">descriptionPosition1</expectedResult>
309+
<actualResult type="variable">attributesPosition1</actualResult>
310+
</assertGreaterThan>
311+
312+
<assertGreaterThan stepKey="assertRelatedBelowAttributes1">
313+
<expectedResult type="variable">attributesPosition1</expectedResult>
314+
<actualResult type="variable">relatedPosition1</actualResult>
315+
</assertGreaterThan>
316+
317+
<assertGreaterThan stepKey="assertUpsellBelowRelated1">
318+
<expectedResult type="variable">relatedPosition1</expectedResult>
319+
<actualResult type="variable">upsellPosition1</actualResult>
320+
</assertGreaterThan>
321+
322+
<!-- Validate in Storefront - 600px width -->
323+
<resizeWindow width="600" height="1000" stepKey="resizeWindowWidth2"/>
324+
325+
<!-- Assert sections on page are in correct order -->
326+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.shortDescription}}')[0].getBoundingClientRect().y" stepKey="shortDescriptionPosition2"/>
327+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.description}}')[0].getBoundingClientRect().y" stepKey="descriptionPosition2"/>
328+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.attributes}}')[0].getBoundingClientRect().y" stepKey="attributesPosition2"/>
329+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.related}}')[0].getBoundingClientRect().y" stepKey="relatedPosition2"/>
330+
<executeJS function="return document.querySelectorAll('{{StorefrontProductFullWidth.upsell}}')[0].getBoundingClientRect().y" stepKey="upsellPosition2"/>
331+
332+
<assertGreaterThan stepKey="assertDescriptionBelowShortDescription2">
333+
<expectedResult type="variable">shortDescriptionPosition2</expectedResult>
334+
<actualResult type="variable">descriptionPosition2</actualResult>
335+
</assertGreaterThan>
336+
337+
<assertGreaterThan stepKey="assertAttributesBelowDescription2">
338+
<expectedResult type="variable">descriptionPosition2</expectedResult>
339+
<actualResult type="variable">attributesPosition2</actualResult>
340+
</assertGreaterThan>
268341

269-
<!-- See Related Products -->
270-
<seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$createProduct1.sku$$)}}" stepKey="seeRelatedProduct1InStorefront"/>
271-
<seeElement selector="{{StorefrontProductRelatedProductsSection.relatedProductName($$createProduct2.sku$$)}}" stepKey="seeRelatedProduct2InStorefront"/>
342+
<assertGreaterThan stepKey="assertRelatedBelowAttributes2">
343+
<expectedResult type="variable">attributesPosition2</expectedResult>
344+
<actualResult type="variable">relatedPosition2</actualResult>
345+
</assertGreaterThan>
272346

273-
<!--Verify Up Sell Products displayed in SimpleProduct page-->
274-
<see stepKey="seeTheUpSellHeading" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
275-
<see stepKey="seeUpsell1" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createProduct3.name$$"/>
276-
<see stepKey="seeUpsell2" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createProduct4.name$$"/>
347+
<assertGreaterThan stepKey="assertUpsellBelowRelated2">
348+
<expectedResult type="variable">relatedPosition2</expectedResult>
349+
<actualResult type="variable">upsellPosition2</actualResult>
350+
</assertGreaterThan>
277351
</test>
278352
</tests>

0 commit comments

Comments
 (0)