Skip to content

Commit cad6b74

Browse files
davemacaulaydavemacaulay
committed
PB-76: PageBuilder Product List Template Is Missing Product Color & Size Options in Admin
1 parent e0987fe commit cad6b74

File tree

6 files changed

+325
-290
lines changed

6 files changed

+325
-290
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,17 @@
163163
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
164164
<see userInput="You must login or register to add items to your wishlist." stepKey="seeWishListSuccessMessage"/>
165165
</actionGroup>
166+
<actionGroup name="validateSwatchInProducts">
167+
<annotations>
168+
<description>Verify a product swatch is displayed within the Product preview within Page Builder.</description>
169+
</annotations>
170+
<arguments>
171+
<argument name="page" defaultValue="" />
172+
<argument name="index" defaultValue="1" type="string"/>
173+
<argument name="productIndex" defaultValue="1" type="string"/>
174+
<argument name="swatch" defaultValue="" />
175+
</arguments>
176+
<waitForElementVisible selector="{{page.product(index)}}" stepKey="waitForProduct"/>
177+
<seeElement selector="{{page.productSwatch(index, productIndex, swatch.default_label)}}" stepKey="assertSwatch"/>
178+
</actionGroup>
166179
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<element name="productAddToWishList" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')]//ol//li[contains(@class,'product-item')])[{{arg1}}]//a[contains(@class,'towishlist') and @title='Add to Wish List']" parameterized="true"/>
2626
<element name="productAddToCompare" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')]//ol//li[contains(@class,'product-item')])[{{arg1}}]//a[contains(@class,'tocompare') and @title='Add to Compare']" parameterized="true"/>
2727
<element name="productActions" type="text" selector=".pagebuilder-products div[data-appearance=grid] ol li.product-item div.product-item-actions"/>
28+
<element name="productSwatch" type="button" selector="((//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')])[{{arg1}}]//ol//li[contains(@class,'product-item')])[{{arg2}}]//div[contains(@class, 'swatch-option')][@aria-label='{{arg3}}']" parameterized="true"/>
2829
<!-- Advanced Configuration -->
2930
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
3031
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'grid')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -55,6 +56,7 @@
5556
<element name="productAddToWishList" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'carousel')]//ol//li[contains(@class,'product-item')])[{{arg1}}]//a[contains(@class,'towishlist') and @title='Add to Wish List']" parameterized="true"/>
5657
<element name="productAddToCompare" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'carousel')]//ol//li[contains(@class,'product-item')])[{{arg1}}]//a[contains(@class,'tocompare') and @title='Add to Compare']" parameterized="true"/>
5758
<element name="productActions" type="text" selector=".pagebuilder-products div[data-appearance=carousel] ol li.product-item div.product-item-actions"/>
59+
<element name="productSwatch" type="button" selector="((//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'carousel')])[{{arg1}}]//ol//li[contains(@class,'product-item')])[{{arg2}}]//div[contains(@class, 'swatch-option')][@aria-label='{{arg3}}']" parameterized="true"/>
5860
<!-- Advanced Configuration -->
5961
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'carousel')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
6062
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-products')]//div[contains(@data-appearance,'carousel')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@
708708
<stories value="Products"/>
709709
<title value="Verify products display swatches within the admin for carousel appearance"/>
710710
<description value="Verify that a product which has swatches display the swatches within the admin for carousel appearance"/>
711-
<severity value="MAJOR"/>
711+
<severity value="AVERAGE"/>
712712
<useCaseId value="PB-76"/>
713713
<testCaseId value="MC-22765"/>
714714
<group value="pagebuilder"/>
@@ -722,9 +722,25 @@
722722
<argument name="page" value="ProductsCarouselOnStage"/>
723723
<argument name="count" value="1"/>
724724
</actionGroup>
725+
<actionGroup ref="validateSwatchInProducts" stepKey="assertFirstSwatch">
726+
<argument name="page" value="ProductsCarouselOnStage"/>
727+
<argument name="swatch" value="visualSwatchOption1"/>
728+
</actionGroup>
729+
<actionGroup ref="validateSwatchInProducts" stepKey="assertSecondSwatch">
730+
<argument name="page" value="ProductsCarouselOnStage"/>
731+
<argument name="swatch" value="visualSwatchOption2"/>
732+
</actionGroup>
725733
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStageAfterSave">
726734
<argument name="page" value="ProductsCarouselOnStage"/>
727735
<argument name="count" value="1"/>
728736
</actionGroup>
737+
<actionGroup ref="validateSwatchInProducts" stepKey="assertFirstSwatchAfterSave">
738+
<argument name="page" value="ProductsCarouselOnStage"/>
739+
<argument name="swatch" value="visualSwatchOption1"/>
740+
</actionGroup>
741+
<actionGroup ref="validateSwatchInProducts" stepKey="assertSecondSwatchAfterSave">
742+
<argument name="page" value="ProductsCarouselOnStage"/>
743+
<argument name="swatch" value="visualSwatchOption2"/>
744+
</actionGroup>
729745
</test>
730746
</tests>

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@
11461146
<stories value="Products"/>
11471147
<title value="Verify products display swatches within the admin for grid appearance"/>
11481148
<description value="Verify that a product which has swatches display the swatches within the admin for grid appearance"/>
1149-
<severity value="MAJOR"/>
1149+
<severity value="AVERAGE"/>
11501150
<useCaseId value="PB-76"/>
11511151
<testCaseId value="MC-22763"/>
11521152
<group value="pagebuilder"/>
@@ -1168,7 +1168,6 @@
11681168
<actionGroup ref="logout" stepKey="logout"/>
11691169
</after>
11701170
<!-- Create a configurable swatch product via the UI -->
1171-
<comment userInput="Create a configurable swatch product via the UI" stepKey="commentCreateConfigurableProduct" />
11721171
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex" />
11731172
<actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
11741173
<argument name="product" value="BaseConfigurableProduct"/>
@@ -1177,11 +1176,9 @@
11771176
<argument name="product" value="BaseConfigurableProduct"/>
11781177
</actionGroup>
11791178
<!-- Add swatch attribute to configurable product -->
1180-
<comment userInput="Add swatch attribute to configurable product" stepKey="commentAddSwatchesToProduct"/>
11811179
<actionGroup ref="AddVisualSwatchToProductWithStorefrontConfigActionGroup" stepKey="addSwatchToProduct"/>
11821180
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
11831181
<!-- Add product to Page Builder Products content type -->
1184-
<comment userInput="Add product to Page Builder Products content type" stepKey="commentAddProductToPageBuilder"/>
11851182
<actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
11861183
<argument name="CMSPage" value="$$createCMSPage$$"/>
11871184
</actionGroup>
@@ -1207,18 +1204,28 @@
12071204
<argument name="count" value="1"/>
12081205
</actionGroup>
12091206
<!-- Verify displayed swatches -->
1210-
<comment userInput="Verify displayed swatches" stepKey="commentVerifySwatches"/>
1211-
<seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption1.default_label)}}" stepKey="assertFirstSwatch"/>
1212-
<seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption2.default_label)}}" stepKey="assertSecondSwatch"/>
1207+
<actionGroup ref="validateSwatchInProducts" stepKey="assertFirstSwatch">
1208+
<argument name="page" value="ProductsOnStage"/>
1209+
<argument name="swatch" value="visualSwatchOption1"/>
1210+
</actionGroup>
1211+
<actionGroup ref="validateSwatchInProducts" stepKey="assertSecondSwatch">
1212+
<argument name="page" value="ProductsOnStage"/>
1213+
<argument name="swatch" value="visualSwatchOption2"/>
1214+
</actionGroup>
12131215
<!-- Save page and verify swatches display on reload -->
1214-
<comment userInput="Save page and verify swatches display on reload" stepKey="commentSaveAndReload"/>
12151216
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
12161217
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
12171218
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStageAfterSave">
12181219
<argument name="page" value="ProductsOnStage"/>
12191220
<argument name="count" value="1"/>
12201221
</actionGroup>
1221-
<seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption1.default_label)}}" stepKey="assertFirstSwatchAfterSave"/>
1222-
<seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption2.default_label)}}" stepKey="assertSecondSwatchAfterSave"/>
1222+
<actionGroup ref="validateSwatchInProducts" stepKey="assertFirstSwatchAfterSave">
1223+
<argument name="page" value="ProductsOnStage"/>
1224+
<argument name="swatch" value="visualSwatchOption1"/>
1225+
</actionGroup>
1226+
<actionGroup ref="validateSwatchInProducts" stepKey="assertSecondSwatchAfterSave">
1227+
<argument name="page" value="ProductsOnStage"/>
1228+
<argument name="swatch" value="visualSwatchOption2"/>
1229+
</actionGroup>
12231230
</test>
12241231
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_default.less

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99

1010
[data-content-type='products'],
1111
.pagebuilder-products {
12-
.rendered-content {
13-
pointer-events: none;
14-
}
15-
1612
.pagebuilder-products-placeholder {
1713
align-items: center;
1814
background-color: @color-gray98;
@@ -40,6 +36,7 @@
4036
max-width: 100%;
4137
min-width: 50px;
4238
padding-left: 20px;
39+
pointer-events: none;
4340
vertical-align: top;
4441
width: 200px;
4542

0 commit comments

Comments
 (0)