Skip to content

Commit ef2178a

Browse files
committed
PB-173: Add Carousel Settings to Product Appearance
- Fixing failing tests
1 parent 84bafaf commit ef2178a

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -429,31 +429,35 @@
429429
<argument name="page" defaultValue="ProductsCarouselOnStage"/>
430430
<argument name="productGroupIndex" defaultValue="1" type="string"/>
431431
<argument name="centerProductIndex" defaultValue="3" type="string"/>
432+
<argument name="acceptableOffset" defaultValue="2" type="string"/>
432433
</arguments>
433434
<executeJS function="return document.evaluate(&quot;{{page.productInCarouselNotClonedBySlickByIndex(productGroupIndex, centerProductIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().right" stepKey="rightPositionOfMiddleProduct"/>
434435
<executeJS function="return document.evaluate(&quot;{{page.productInCarouselNotClonedBySlickByIndex(productGroupIndex, centerProductIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().width" stepKey="widthOfMiddleProduct"/>
435436
<executeJS function="return Math.abs({$rightPositionOfMiddleProduct} - ({$widthOfMiddleProduct} / 2))" stepKey="centerPositionOfMiddleProduct"/>
436437
<executeJS function="return document.evaluate(&quot;{{page.base(productGroupIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().right" stepKey="rightPositionOfProductGroup"/>
437438
<executeJS function="return document.evaluate(&quot;{{page.base(productGroupIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().width" stepKey="widthOfProductGroup"/>
438439
<executeJS function="return Math.abs({$rightPositionOfProductGroup} - ({$widthOfProductGroup} / 2))" stepKey="centerPositionOfProductGroup"/>
439-
<assertEquals stepKey="assertProductsAreCentered">
440-
<expectedResult type="variable">centerPositionOfProductGroup</expectedResult>
441-
<actualResult type="variable">centerPositionOfMiddleProduct</actualResult>
442-
</assertEquals>
440+
<executeJS function="return Math.abs({$centerPositionOfProductGroup} - {$centerPositionOfMiddleProduct})" stepKey="differenceBetweenCenterPositions"/>
441+
<assertLessThanOrEqual stepKey="assertCenterPositionAcceptable">
442+
<expectedResult type="int">{{acceptableOffset}}</expectedResult>
443+
<actualResult type="variable">differenceBetweenCenterPositions</actualResult>
444+
</assertLessThanOrEqual>
443445
</actionGroup>
444446
<actionGroup name="validateProductsInProductCarouselAreCenteredForEvenNumberOfProducts">
445447
<arguments>
446448
<argument name="page" defaultValue="ProductsCarouselOnStage"/>
447449
<argument name="productGroupIndex" defaultValue="1" type="string"/>
448450
<argument name="adjacentLeftOfCenterProductIndex" defaultValue="1" type="string"/>
451+
<argument name="acceptableOffset" defaultValue="2" type="string"/>
449452
</arguments>
450453
<executeJS function="return document.evaluate(&quot;{{page.productInCarouselNotClonedBySlickByIndex(productGroupIndex, adjacentLeftOfCenterProductIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().right" stepKey="rightPositionOfAdjacentLeftOfCenterProduct"/>
451454
<executeJS function="return document.evaluate(&quot;{{page.base(productGroupIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().right" stepKey="rightPositionOfProductGroup"/>
452455
<executeJS function="return document.evaluate(&quot;{{page.base(productGroupIndex)}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().width" stepKey="widthOfProductGroup"/>
453456
<executeJS function="return Math.abs({$rightPositionOfProductGroup} - ({$widthOfProductGroup} / 2))" stepKey="centerPositionOfProductGroup"/>
454-
<assertEquals stepKey="assertProductsAreCentered">
455-
<expectedResult type="variable">centerPositionOfProductGroup</expectedResult>
456-
<actualResult type="variable">rightPositionOfAdjacentLeftOfCenterProduct</actualResult>
457-
</assertEquals>
457+
<executeJS function="return Math.abs({$centerPositionOfProductGroup} - {$rightPositionOfAdjacentLeftOfCenterProduct})" stepKey="differenceBetweenCenterPositions"/>
458+
<assertLessThanOrEqual stepKey="assertCenterPositionAcceptable">
459+
<expectedResult type="int">{{acceptableOffset}}</expectedResult>
460+
<actualResult type="variable">differenceBetweenCenterPositions</actualResult>
461+
</assertLessThanOrEqual>
458462
</actionGroup>
459463
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</entity>
178178
<entity name="PageBuilderProductsCarouselCountPropertyThree" type="pagebuilder_products_carousel_number_of_products">
179179
<data key="name">Number of Products to Display</data>
180-
<data key="section">general</data>
180+
<data key="section">appearance_fieldset</data>
181181
<data key="fieldName">carousel_products_count</data>
182182
<data key="value">3</data>
183183
</entity>
@@ -189,7 +189,7 @@
189189
</entity>
190190
<entity name="PageBuilderProductsCarouselCountPropertyFive" type="pagebuilder_products_carousel_number_of_products">
191191
<data key="name">Number of Products to Display</data>
192-
<data key="section">general</data>
192+
<data key="section">appearance_fieldset</data>
193193
<data key="fieldName">carousel_products_count</data>
194194
<data key="value">5</data>
195195
</entity>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTests.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,7 +2334,7 @@
23342334
<argument name="product" value="$$createProduct6$$"/>
23352335
</actionGroup>
23362336
<!-- Validate Stage: Verify Autoplay Occurs -->
2337-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel"/>
2337+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel"/>
23382338
<wait time="12" stepKey="waitForAutoplayStage"/>
23392339
<actionGroup ref="validateProductCarouselNavigationDots" stepKey="validateProductCarouselNavigationDotsStage2">
23402340
<argument name="activeNavigationDot" value="2"/>
@@ -2361,7 +2361,7 @@
23612361
<argument name="product" value="$$createProduct6$$"/>
23622362
</actionGroup>
23632363
<!-- Validate Stage: Verify Autoplay Reoccurs -->
2364-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel2"/>
2364+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel2"/>
23652365
<wait time="12" stepKey="waitForAutoplayStage2"/>
23662366
<actionGroup ref="validateProductCarouselNavigationDots" stepKey="validateProductCarouselNavigationDotsStage4">
23672367
<argument name="activeNavigationDot" value="2"/>
@@ -2389,7 +2389,7 @@
23892389
<argument name="product" value="$$createProduct6$$"/>
23902390
</actionGroup>
23912391
<!-- Validate Stage: Verify Autoplay Reoccurs Again -->
2392-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel3"/>
2392+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel3"/>
23932393
<wait time="12" stepKey="waitForAutoplayStage3"/>
23942394
<actionGroup ref="validateProductCarouselNavigationDots" stepKey="validateProductCarouselNavigationDotsStage6">
23952395
<argument name="activeNavigationDot" value="2"/>
@@ -2577,14 +2577,14 @@
25772577
<actionGroup ref="clickProductCarouselNavigationDot" stepKey="clickFirstNavigationDotStage3">
25782578
<argument name="navigationDotIndex" value="2"/>
25792579
</actionGroup>
2580-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel4" after="clickFirstNavigationDotStage3"/>
2580+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel4" after="clickFirstNavigationDotStage3"/>
25812581
<wait time="12" stepKey="waitForAutoplayStage4" after="clickLeftPanel4"/>
25822582
<actionGroup ref="validateProductCarouselPreviousNavigationArrowEnabled" stepKey="validateProductCarouselPreviousNavigationArrowDisabledStage3"/>
25832583
<actionGroup ref="validateProductCarouselNextNavigationArrowEnabled" stepKey="validateProductCarouselNextNavigationArrowDisabledStage4"/>
25842584
<actionGroup ref="clickProductCarouselNavigationDot" stepKey="clickPreviousNavigationArrowStage5">
25852585
<argument name="navigationDotIndex" value="2"/>
25862586
</actionGroup>
2587-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel5" after="clickPreviousNavigationArrowStage5"/>
2587+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel5" after="clickPreviousNavigationArrowStage5"/>
25882588
<wait time="12" stepKey="waitForAutoplayStage5" after="clickLeftPanel5"/>
25892589
<actionGroup ref="validateProductCarouselPreviousNavigationArrowEnabled" stepKey="validateProductCarouselPreviousNavigationArrowDisabledStage5"/>
25902590
<actionGroup ref="validateProductCarouselNextNavigationArrowEnabled" stepKey="validateProductCarouselNextNavigationArrowDisabledStage6"/>
@@ -2749,7 +2749,7 @@
27492749
<argument name="productItemIndex" value="4"/>
27502750
</actionGroup>
27512751
<!-- Validate Stage: Verify Autoplay Occurs -->
2752-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel"/>
2752+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel"/>
27532753
<wait time="12" stepKey="waitForAutoplayStage"/>
27542754
<actionGroup ref="validateProductCarouselNavigationDots" stepKey="validateProductCarouselNavigationDotsStage2">
27552755
<argument name="navigationDotCount" value="6"/>
@@ -2784,7 +2784,7 @@
27842784
<argument name="productItemIndex" value="1"/>
27852785
</actionGroup>
27862786
<!-- Validate Stage: Verify Autoplay Reoccurs -->
2787-
<click selector="{{PageBuilderPanel.leftPanel}}" stepKey="clickLeftPanel2"/>
2787+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickLeftPanel2"/>
27882788
<wait time="12" stepKey="waitForAutoplayStage2"/>
27892789
<actionGroup ref="validateProductCarouselNavigationDots" stepKey="validateProductCarouselNavigationDotsStage4">
27902790
<argument name="navigationDotCount" value="6"/>

0 commit comments

Comments
 (0)