Skip to content

Commit 34fa44a

Browse files
dimonovpdimonovp
committed
Merge remote-tracking branch 'origin/2.3-develop' into MC-30717
2 parents 49bcec5 + 7ca65cf commit 34fa44a

File tree

5 files changed

+312
-9
lines changed

5 files changed

+312
-9
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
-->
7+
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup">
11+
<annotations>
12+
<description>Validate that the Product Image is present on preview and correct on frontend product page.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="productImage" type="string" defaultValue="{{MagentoLogo.file}}"/>
16+
</arguments>
17+
18+
<waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitGallerySpinnerDisappear"/>
19+
<seeElement selector="{{StorefrontProductMediaSection.gallery}}" stepKey="seeProductGallery"/>
20+
<seeElement selector="{{StorefrontProductMediaSection.productImageActive(productImage)}}" stepKey="seeCorrectProductImage"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontGalleryConfigurableProductWithSeveralAttributesTest.xml‎ renamed to ‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontGalleryConfigurableProductWithSeveralAttributesPrependMediaTest.xml‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="StorefrontGalleryConfigurableProductWithSeveralAttributesTest">
11+
<test name="StorefrontGalleryConfigurableProductWithSeveralAttributesPrependMediaTest">
1212
<annotations>
1313
<features value="ConfigurableProduct"/>
14-
<stories value="Verify functionality of updating Gallery items on 'view Product' Storefront page for Configurable Product with several attributes of different types"/>
14+
<stories value="Prepend variation media on storefront"/>
1515
<title value="Storefront Gallery - Configurable Product with several attributes: prepend variation media"/>
1616
<description value="Storefront Gallery - Configurable Product with several attributes: prepend variation media"/>
1717
<severity value="AVERAGE"/>
@@ -20,8 +20,8 @@
2020
<group value="configurableProduct"/>
2121
<group value="swatch"/>
2222
</annotations>
23+
2324
<before>
24-
<createData entity="ProductVideoYoutubeApiKeyConfig" stepKey="setupYoutubeApiKey"/>
2525
<!--Create 1 configurable product with 2 variations-->
2626
<createData entity="ApiConfigurableProductWithDescription" stepKey="createConfigurableProduct"/>
2727
<!--Create product drop down attribute-->
@@ -93,9 +93,12 @@
9393
<argument name="image" value="Magento3Image"/>
9494
</actionGroup>
9595
<actionGroup ref="AdminAddProductVideoWithPreviewActionGroup" stepKey="addVideoToConfigurableProduct">
96+
<argument name="video" value="VimeoProductVideo"/>
9697
<argument name="image" value="{{TestImageNew.file}}"/>
9798
</actionGroup>
98-
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertVideoAddedToConfigurableProduct"/>
99+
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertVideoAddedToConfigurableProduct">
100+
<argument name="video" value="VimeoProductVideo"/>
101+
</actionGroup>
99102
<actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveConfigurableProduct"/>
100103

101104
<!-- Load media for configurable product variation option1-option1-->
@@ -109,26 +112,35 @@
109112
<argument name="image" value="TestImageNew"/>
110113
</actionGroup>
111114
<actionGroup ref="AdminAddProductVideoWithPreviewActionGroup" stepKey="addVideoToConfigurableProductVariationOption1Option1">
115+
<argument name="video" value="VimeoProductVideo"/>
112116
<argument name="image" value="{{placeholderSmallImage.file}}"/>
113117
</actionGroup>
114-
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertVideoAddedToConfigurableProductVariationOption1Option1"/>
118+
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertVideoAddedToConfigurableProductVariationOption1Option1">
119+
<argument name="video" value="VimeoProductVideo"/>
120+
</actionGroup>
115121
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveConfigurableProductVariationOption1Option1"/>
116122

117123
<!-- Load media for configurable product variation option1-option2-->
118124
<actionGroup ref="filterAndSelectProduct" stepKey="openConfigurableProductVariationOption1Option2">
119125
<argument name="productSku" value="$createConfigurableProduct.sku$-$dropdownAttributeFirstOption.option[store_labels][0][label]$-$swatchAttributeSecondOption.option[store_labels][0][label]$"/>
120126
</actionGroup>
121127
<actionGroup ref="AdminAddProductVideoWithPreviewActionGroup" stepKey="addFirstVideoToConfigurableProductVariationOption1Option2">
128+
<argument name="video" value="VimeoProductVideo"/>
122129
<argument name="image" value="{{Magento3Image.file}}"/>
123130
</actionGroup>
124-
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertFirstVideoAddedToConfigurableProductVariationOption1Option2"/>
131+
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertFirstVideoAddedToConfigurableProductVariationOption1Option2">
132+
<argument name="video" value="VimeoProductVideo"/>
133+
</actionGroup>
125134
<actionGroup ref="addProductImage" stepKey="addFirstImageToConfigurableProductVariationOption1Option2">
126135
<argument name="image" value="MagentoLogo"/>
127136
</actionGroup>
128137
<actionGroup ref="AdminAddProductVideoWithPreviewActionGroup" stepKey="addSecondVideoToConfigurableProductVariationOption1Option2">
138+
<argument name="video" value="VimeoProductVideo"/>
129139
<argument name="image" value="{{placeholderThumbnailImage.file}}"/>
130140
</actionGroup>
131-
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertSecondVideoAddedToConfigurableProductVariationOption1Option2"/>
141+
<actionGroup ref="assertProductVideoAdminProductPage" stepKey="assertSecondVideoAddedToConfigurableProductVariationOption1Option2">
142+
<argument name="video" value="VimeoProductVideo"/>
143+
</actionGroup>
132144
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveConfigurableProductVariationOption1Option2"/>
133145

134146
<!-- Load media for configurable product variation option2-option2-->
@@ -145,7 +157,6 @@
145157
</before>
146158

147159
<after>
148-
<createData entity="DefaultProductVideoConfig" stepKey="resetStoreDefaultVideoConfig"/>
149160
<actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProductsWithAllVariations">
150161
<argument name="product" value="$createConfigurableProduct$"/>
151162
</actionGroup>
@@ -165,7 +176,7 @@
165176
</after>
166177

167178
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openConfigurableProductPage">
168-
<argument name="productUrl" value="$$createConfigurableProduct.custom_attributes[url_key]$$"/>
179+
<argument name="productUrl" value="$createConfigurableProduct.custom_attributes[url_key]$"/>
169180
</actionGroup>
170181

171182
<!--CASE 0: Selected options = none; Expected media : C1, C2, C3-->

0 commit comments

Comments
 (0)