Skip to content

Commit 79f75dd

Browse files
dhaeckerdhaecker
committed
B2B-1653: Add MFTF test for MC-38408
 - Updating import grouped product MFTF test to use existing images
1 parent 93278b8 commit 79f75dd

File tree

3 files changed

+99
-45
lines changed

3 files changed

+99
-45
lines changed

‎app/code/Magento/GroupedImportExport/Test/Mftf/Data/ImportData.xml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@
3333
<data key="groupedPosition">1</data>
3434
<data key="urlKey">import-product-simple1-grouped</data>
3535
<data key="weight">1</data>
36-
<data key="thumbnailImage">/m/a/magento-logo</data>
36+
<data key="baseImage">magento-logo.png</data>
37+
<data key="baseImageName">magento-logo</data>
38+
<data key="smallImage">magento-logo.png</data>
39+
<data key="smallImageName">magento-logo</data>
40+
<data key="thumbnailImage">magento-logo.png</data>
41+
<data key="thumbnailImageName">magento-logo</data>
3742
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
3843
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
3944
</entity>
@@ -52,7 +57,12 @@
5257
<data key="groupedPosition">0</data>
5358
<data key="urlKey">import-product-simple2-grouped</data>
5459
<data key="weight">2</data>
55-
<data key="thumbnailImage">/t/e/test_image</data>
60+
<data key="baseImage">m-logo.gif</data>
61+
<data key="baseImageName">m-logo</data>
62+
<data key="smallImage">m-logo.gif</data>
63+
<data key="smallImageName">m-logo</data>
64+
<data key="thumbnailImage">m-logo.gif</data>
65+
<data key="thumbnailImageName">m-logo</data>
5666
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
5767
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
5868
</entity>
@@ -71,7 +81,12 @@
7181
<data key="groupedPosition">2</data>
7282
<data key="urlKey">import-product-simple3-grouped</data>
7383
<data key="weight">3</data>
74-
<data key="thumbnailImage">/a/d/adobe-base</data>
84+
<data key="baseImage">adobe-base.jpg</data>
85+
<data key="baseImageName">adobe-base</data>
86+
<data key="smallImage">adobe-base.jpg</data>
87+
<data key="smallImageName">adobe-base</data>
88+
<data key="thumbnailImage">adobe-base.jpg</data>
89+
<data key="thumbnailImageName">adobe-base</data>
7590
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
7691
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
7792
</entity>
@@ -88,5 +103,11 @@
88103
<data key="quantity">0</data>
89104
<data key="weight">1</data>
90105
<data key="urlKey">import-product-grouped</data>
106+
<data key="baseImage">magento-logo.png</data>
107+
<data key="baseImageName">magento-logo</data>
108+
<data key="smallImage">m-logo.gif</data>
109+
<data key="smallImageName">m-logo</data>
110+
<data key="thumbnailImage">adobe-base.jpg</data>
111+
<data key="thumbnailImageName">adobe-base</data>
91112
</entity>
92113
</entities>

‎app/code/Magento/GroupedImportExport/Test/Mftf/Test/AdminImportGroupedProductTest.xml‎

Lines changed: 71 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,38 @@
2222
</annotations>
2323

2424
<before>
25-
<!-- Create Product, Upload Images & Create Customer -->
25+
<!-- Create Category & Customer -->
2626
<createData entity="ImportCategory_Grouped" stepKey="createImportCategory"/>
27-
<createData entity="_defaultCategory" stepKey="createCategory"/>
28-
<createData entity="ApiSimpleProduct" stepKey="productForImages">
29-
<requiredEntity createDataKey="createCategory"/>
30-
</createData>
31-
<createData entity="ApiProductAttributeMediaGalleryForExportImport" stepKey="productImage1">
32-
<requiredEntity createDataKey="productForImages"/>
33-
</createData>
34-
<createData entity="ApiProductAttributeMediaGalleryForExportImport2" stepKey="productImage2">
35-
<requiredEntity createDataKey="productForImages"/>
36-
</createData>
37-
<createData entity="ApiProductAttributeMediaGalleryForExportImport3" stepKey="productImage3">
38-
<requiredEntity createDataKey="productForImages"/>
39-
</createData>
4027
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
4128

29+
<!-- Copy Images to Import Directory for Product Images -->
30+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="createDirectory" stepKey="createDirectoryForImportImages">
31+
<argument name="path">var/import/images/{{ImportProduct_Grouped.name}}</argument>
32+
</helper>
33+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copyProduct1BaseImage">
34+
<argument name="source">dev/tests/acceptance/tests/_data/{{ImportProductSimple1_Grouped.baseImage}}</argument>
35+
<argument name="destination">var/import/images/{{ImportProduct_Grouped.name}}/{{ImportProductSimple1_Grouped.baseImage}}</argument>
36+
</helper>
37+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copyProduct2BaseImage">
38+
<argument name="source">dev/tests/acceptance/tests/_data/{{ImportProductSimple2_Grouped.smallImage}}</argument>
39+
<argument name="destination">var/import/images/{{ImportProduct_Grouped.name}}/{{ImportProductSimple2_Grouped.smallImage}}</argument>
40+
</helper>
41+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="copy" stepKey="copyProduct3BaseImage">
42+
<argument name="source">dev/tests/acceptance/tests/_data/{{ImportProductSimple3_Grouped.thumbnailImage}}</argument>
43+
<argument name="destination">var/import/images/{{ImportProduct_Grouped.name}}/{{ImportProductSimple3_Grouped.thumbnailImage}}</argument>
44+
</helper>
45+
4246
<!-- Login as Admin -->
4347
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
4448
</before>
4549

4650
<after>
4751
<!-- Delete Data -->
4852
<deleteData createDataKey="createImportCategory" stepKey="deleteImportCategory"/>
49-
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
50-
<deleteData createDataKey="productForImages" stepKey="deleteProductForImages"/>
5153
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
54+
<helper class="\Magento\Catalog\Test\Mftf\Helper\LocalFileAssertions" method="deleteDirectory" stepKey="deleteProductImageDirectory">
55+
<argument name="path">var/import/images/{{ImportProduct_Grouped.name}}</argument>
56+
</helper>
5257
<deleteData url="/V1/products/{{ImportProductSimple1_Grouped.urlKey}}" stepKey="deleteImportedSimpleProduct1"/>
5358
<deleteData url="/V1/products/{{ImportProductSimple2_Grouped.urlKey}}" stepKey="deleteImportedSimpleProduct2"/>
5459
<deleteData url="/V1/products/{{ImportProductSimple3_Grouped.urlKey}}" stepKey="deleteImportedSimpleProduct3"/>
@@ -61,6 +66,7 @@
6166
<actionGroup ref="AdminNavigateToImportPageActionGroup" stepKey="navigateToImportPage"/>
6267
<actionGroup ref="AdminFillImportFormActionGroup" stepKey="fillImportForm">
6368
<argument name="importFile" value="{{ImportProduct_Grouped.fileName}}"/>
69+
<argument name="imagesFileDirectory" value="{{ImportProduct_Grouped.name}}"/>
6470
</actionGroup>
6571
<actionGroup ref="AdminClickCheckDataImportActionGroup" stepKey="clickCheckData"/>
6672
<see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{ImportCommonMessages.validFile}}" stepKey="seeCheckDataResultMessage"/>
@@ -96,9 +102,18 @@
96102
<argument name="productWeight" value="{{ImportProductSimple1_Grouped.weight}}"/>
97103
<argument name="categoryName" value="{{ImportCategory_Grouped.name}}"/>
98104
</actionGroup>
99-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertProduct1ImageOnEditPage">
100-
<argument name="image" value="MagentoLogo"/>
105+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct1BaseImageOnEditPage">
106+
<argument name="image" value="{{ImportProductSimple1_Grouped.baseImageName}}"/>
107+
</actionGroup>
108+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple1_Grouped.baseImageName, 'image')}}" stepKey="seeBaseImageRole1"/>
109+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct1SmallImageOnEditPage">
110+
<argument name="image" value="{{ImportProductSimple1_Grouped.smallImageName}}"/>
101111
</actionGroup>
112+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple1_Grouped.smallImageName, 'small_image')}}" stepKey="seeSmallImageRole1"/>
113+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct1ThumbnailImageOnEditPage">
114+
<argument name="image" value="{{ImportProductSimple1_Grouped.thumbnailImageName}}"/>
115+
</actionGroup>
116+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple1_Grouped.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRole1"/>
102117

103118
<!-- Admin: Verify Simple Product 2 on Edit Product Page -->
104119
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="goToSimpleProduct2EditPage">
@@ -113,9 +128,18 @@
113128
<argument name="productWeight" value="{{ImportProductSimple2_Grouped.weight}}"/>
114129
<argument name="categoryName" value="{{ImportCategory_Grouped.name}}"/>
115130
</actionGroup>
116-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertProduct2ImageOnEditPage">
117-
<argument name="image" value="TestImage"/>
131+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct2BaseImageOnEditPage">
132+
<argument name="image" value="{{ImportProductSimple2_Grouped.baseImageName}}"/>
133+
</actionGroup>
134+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple2_Grouped.baseImageName, 'image')}}" stepKey="seeBaseImageRole2"/>
135+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct2SmallImageOnEditPage">
136+
<argument name="image" value="{{ImportProductSimple2_Grouped.smallImageName}}"/>
118137
</actionGroup>
138+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple2_Grouped.smallImageName, 'small_image')}}" stepKey="seeSmallImageRole2"/>
139+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct2ThumbnailImageOnEditPage">
140+
<argument name="image" value="{{ImportProductSimple2_Grouped.thumbnailImageName}}"/>
141+
</actionGroup>
142+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple2_Grouped.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRole2"/>
119143

120144
<!-- Admin: Verify Simple Product 3 on Edit Product Page -->
121145
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="goToSimpleProduct3EditPage">
@@ -130,9 +154,18 @@
130154
<argument name="productWeight" value="{{ImportProductSimple3_Grouped.weight}}"/>
131155
<argument name="categoryName" value="{{ImportCategory_Grouped.name}}"/>
132156
</actionGroup>
133-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertProduct3ImageOnEditPage">
134-
<argument name="image" value="TestImageAdobe"/>
157+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct3BaseImageOnEditPage">
158+
<argument name="image" value="{{ImportProductSimple3_Grouped.baseImageName}}"/>
159+
</actionGroup>
160+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple3_Grouped.baseImageName, 'image')}}" stepKey="seeBaseImageRole3"/>
161+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct3SmallImageOnEditPage">
162+
<argument name="image" value="{{ImportProductSimple3_Grouped.smallImageName}}"/>
135163
</actionGroup>
164+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple3_Grouped.smallImageName, 'small_image')}}" stepKey="seeSmallImageRole3"/>
165+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertProduct3ThumbnailImageOnEditPage">
166+
<argument name="image" value="{{ImportProductSimple3_Grouped.thumbnailImageName}}"/>
167+
</actionGroup>
168+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple3_Grouped.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRole3"/>
136169

137170
<!-- Admin: Verify Grouped Product Common Data on Edit Product Page -->
138171
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="goToGroupedProductEditPage">
@@ -143,25 +176,25 @@
143176
<argument name="productName" value="{{ImportProduct_Grouped.name}}"/>
144177
<argument name="productSku" value="{{ImportProduct_Grouped.sku}}"/>
145178
<argument name="productQuantity" value="{{ImportProduct_Grouped.quantity}}"/>
146-
<argument name="categoryNames" value="{{ImportCategory_Grouped.name}}"/>
179+
<argument name="categoryName" value="{{ImportCategory_Grouped.name}}"/>
147180
</actionGroup>
148-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertGroupedProductBaseImageOnEditPage">
149-
<argument name="image" value="MagentoLogo"/>
181+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertGroupedProductBaseImageOnEditPage">
182+
<argument name="image" value="{{ImportProduct_Grouped.baseImageName}}"/>
150183
</actionGroup>
151-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(MagentoLogo.filename, 'image')}}" stepKey="seeBaseImageRoleGrouped"/>
152-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertGroupedProductSmallImageOnEditPage">
153-
<argument name="image" value="TestImage"/>
184+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProduct_Grouped.baseImageName, 'image')}}" stepKey="seeBaseImageRoleGrouped"/>
185+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertGroupedProductSmallImageOnEditPage">
186+
<argument name="image" value="{{ImportProduct_Grouped.smallImageName}}"/>
154187
</actionGroup>
155-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImage.filename, 'small_image')}}" stepKey="seeSmallImageRoleGrouped"/>
156-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertGroupedProductThumbnailImageOnEditPage">
157-
<argument name="image" value="TestImageAdobe"/>
188+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProduct_Grouped.smallImageName, 'small_image')}}" stepKey="seeSmallImageRoleGrouped"/>
189+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertGroupedProductThumbnailImageOnEditPage">
190+
<argument name="image" value="{{ImportProduct_Grouped.thumbnailImageName}}"/>
158191
</actionGroup>
159-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImageAdobe.filename, 'thumbnail')}}" stepKey="seeThumbnailImageRoleGrouped"/>
192+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProduct_Grouped.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRoleGrouped"/>
160193

161194
<!-- Admin: Verify Grouped Product Information on Edit Product Page -->
162195
<seeNumberOfElements userInput="3" selector="{{AdminGroupedProductOptionGridSection.allRows}}" stepKey="see3RowsAdmin"/>
163196
<actionGroup ref="AdminVerifyAssociatedProductForGroupedProductActionGroup" stepKey="verifyAssociatedProduct1Admin">
164-
<argument name="image" value="{{ImportProductSimple2_Grouped.thumbnailImage}}"/>
197+
<argument name="image" value="{{ImportProductSimple2_Grouped.thumbnailImageName}}"/>
165198
<argument name="name" value="{{ImportProductSimple2_Grouped.name}}"/>
166199
<argument name="attributeSet" value="{{ImportProductSimple2_Grouped.attributeSetText}}"/>
167200
<argument name="status" value="{{ImportProductSimple2_Grouped.statusText}}"/>
@@ -172,7 +205,7 @@
172205
<argument name="index" value="1"/>
173206
</actionGroup>
174207
<actionGroup ref="AdminVerifyAssociatedProductForGroupedProductActionGroup" stepKey="verifyAssociatedProduct2Admin">
175-
<argument name="image" value="{{ImportProductSimple1_Grouped.thumbnailImage}}"/>
208+
<argument name="image" value="{{ImportProductSimple1_Grouped.thumbnailImageName}}"/>
176209
<argument name="name" value="{{ImportProductSimple1_Grouped.name}}"/>
177210
<argument name="attributeSet" value="{{ImportProductSimple1_Grouped.attributeSetText}}"/>
178211
<argument name="status" value="{{ImportProductSimple1_Grouped.statusText}}"/>
@@ -183,7 +216,7 @@
183216
<argument name="index" value="2"/>
184217
</actionGroup>
185218
<actionGroup ref="AdminVerifyAssociatedProductForGroupedProductActionGroup" stepKey="verifyAssociatedProduct3Admin">
186-
<argument name="image" value="{{ImportProductSimple3_Grouped.thumbnailImage}}"/>
219+
<argument name="image" value="{{ImportProductSimple3_Grouped.thumbnailImageName}}"/>
187220
<argument name="name" value="{{ImportProductSimple3_Grouped.name}}"/>
188221
<argument name="attributeSet" value="{{ImportProductSimple3_Grouped.attributeSetText}}"/>
189222
<argument name="status" value="{{ImportProductSimple3_Grouped.statusText}}"/>
@@ -213,9 +246,9 @@
213246
</actionGroup>
214247
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{ImportProduct_Grouped.name}}" stepKey="seeProductName"/>
215248
<see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{ImportProduct_Grouped.sku}}" stepKey="seeSku"/>
216-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(MagentoLogo.filename)}}" stepKey="seeMagentoLogo"/>
217-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(TestImage.filename)}}" stepKey="seeTestImage"/>
218-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(TestImageAdobe.filename)}}" stepKey="seeTestImageAdobe"/>
249+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple1_Grouped.baseImageName)}}" stepKey="seeProduct1BaseImage"/>
250+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple2_Grouped.baseImageName)}}" stepKey="seeProduct2BaseImage"/>
251+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple3_Grouped.baseImageName)}}" stepKey="seeProduct3BaseImage"/>
219252

220253
<!-- Storefront: Verify Associated Grouped Products -->
221254
<seeNumberOfElements userInput="3" selector="{{StorefrontProductInfoMainSection.groupedProductsTableAllRows}}" stepKey="see3RowsStorefront"/>

0 commit comments

Comments
 (0)