Skip to content

Commit ceae428

Browse files
dhaeckerdhaecker
committed
B2B-1654: Add MFTF test for MC-38432
 - Updating import bundle product MFTF test to use existing images
1 parent 79f75dd commit ceae428

File tree

3 files changed

+92
-65
lines changed

3 files changed

+92
-65
lines changed

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

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,14 @@
2929
<data key="status">1</data>
3030
<data key="statusText">Enabled</data>
3131
<data key="quantity">101</data>
32-
<data key="urlKey">import-product-simple1-bundle</data>
3332
<data key="weight">1</data>
34-
<data key="thumbnailImage">/m/a/magento-logo</data>
33+
<data key="urlKey">import-product-simple1-bundle</data>
34+
<data key="baseImage">magento-logo.png</data>
35+
<data key="baseImageName">magento-logo</data>
36+
<data key="smallImage">magento-logo.png</data>
37+
<data key="smallImageName">magento-logo</data>
38+
<data key="thumbnailImage">magento-logo.png</data>
39+
<data key="thumbnailImageName">magento-logo</data>
3540
<data key="bundleIsDefault">false</data>
3641
<data key="bundleDefaultQuantity">2</data>
3742
<data key="bundleUserDefined">true</data>
@@ -49,9 +54,14 @@
4954
<data key="status">1</data>
5055
<data key="statusText">Enabled</data>
5156
<data key="quantity">102</data>
52-
<data key="urlKey">import-product-simple2-bundle</data>
5357
<data key="weight">2</data>
54-
<data key="thumbnailImage">/t/e/test_image</data>
58+
<data key="urlKey">import-product-simple2-bundle</data>
59+
<data key="baseImage">m-logo.gif</data>
60+
<data key="baseImageName">m-logo</data>
61+
<data key="smallImage">m-logo.gif</data>
62+
<data key="smallImageName">m-logo</data>
63+
<data key="thumbnailImage">m-logo.gif</data>
64+
<data key="thumbnailImageName">m-logo</data>
5565
<data key="bundleIsDefault">true</data>
5666
<data key="bundleDefaultQuantity">4</data>
5767
<data key="bundleUserDefined">false</data>
@@ -69,9 +79,14 @@
6979
<data key="status">1</data>
7080
<data key="statusText">Enabled</data>
7181
<data key="quantity">103</data>
72-
<data key="urlKey">import-product-simple3-bundle</data>
7382
<data key="weight">3</data>
74-
<data key="thumbnailImage">/a/d/adobe-base</data>
83+
<data key="urlKey">import-product-simple3-bundle</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
<data key="bundleIsDefault">false</data>
7691
<data key="bundleDefaultQuantity">3</data>
7792
<data key="bundleUserDefined">false</data>
@@ -95,6 +110,12 @@
95110
<data key="quantity">0</data>
96111
<data key="weight"/>
97112
<data key="urlKey">import-product-bundle</data>
113+
<data key="baseImage">magento-logo.png</data>
114+
<data key="baseImageName">magento-logo</data>
115+
<data key="smallImage">m-logo.gif</data>
116+
<data key="smallImageName">m-logo</data>
117+
<data key="thumbnailImage">adobe-base.jpg</data>
118+
<data key="thumbnailImageName">adobe-base</data>
98119
<data key="totalBundleOptions">2</data>
99120
<data key="bundleOptionShipmentType">Together</data>
100121
<data key="bundleOption1Title">Bundle Option A</data>

‎app/code/Magento/BundleImportExport/Test/Mftf/Test/AdminImportBundleProductTest.xml

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,36 @@
2424
<before>
2525
<!-- Create Product, Upload Images & Create Customer -->
2626
<createData entity="ImportCategory_Bundle" 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_Bundle.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_Bundle.baseImage}}</argument>
35+
<argument name="destination">var/import/images/{{ImportProduct_Bundle.name}}/{{ImportProductSimple1_Bundle.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_Bundle.smallImage}}</argument>
39+
<argument name="destination">var/import/images/{{ImportProduct_Bundle.name}}/{{ImportProductSimple2_Bundle.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_Bundle.thumbnailImage}}</argument>
43+
<argument name="destination">var/import/images/{{ImportProduct_Bundle.name}}/{{ImportProductSimple3_Bundle.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_Bundle.name}}</argument>
56+
</helper>
5257
<deleteData url="/V1/products/{{ImportProductSimple1_Bundle.urlKey}}" stepKey="deleteImportedSimpleProduct1"/>
5358
<deleteData url="/V1/products/{{ImportProductSimple2_Bundle.urlKey}}" stepKey="deleteImportedSimpleProduct2"/>
5459
<deleteData url="/V1/products/{{ImportProductSimple3_Bundle.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_Bundle.fileName}}"/>
69+
<argument name="imagesFileDirectory" value="{{ImportProduct_Bundle.name}}"/>
6470
</actionGroup>
6571
<actionGroup ref="AdminClickCheckDataImportActionGroup" stepKey="clickCheckData"/>
6672
<see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{ImportCommonMessages.validFile}}" stepKey="seeCheckDataResultMessage"/>
@@ -97,18 +103,18 @@
97103
<argument name="productWeight" value="{{ImportProductSimple1_Bundle.weight}}"/>
98104
<argument name="categoryName" value="{{ImportCategory_Bundle.name}}"/>
99105
</actionGroup>
100-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct1ImageOnEditPage">
101-
<argument name="image" value="MagentoLogo"/>
106+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct1ImageOnEditPage">
107+
<argument name="image" value="{{ImportProductSimple1_Bundle.baseImageName}}"/>
102108
</actionGroup>
103-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(MagentoLogo.filename, 'image')}}" stepKey="seeBaseImageRoleSimple1"/>
104-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct1SmallImageOnEditPage">
105-
<argument name="image" value="MagentoLogo"/>
109+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple1_Bundle.baseImageName, 'image')}}" stepKey="seeBaseImageRoleSimple1"/>
110+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct1SmallImageOnEditPage">
111+
<argument name="image" value="{{ImportProductSimple1_Bundle.smallImageName}}"/>
106112
</actionGroup>
107-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(MagentoLogo.filename, 'small_image')}}" stepKey="seeSmallImageRoleSimple1"/>
108-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct1ThumbnailImageOnEditPage">
109-
<argument name="image" value="MagentoLogo"/>
113+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple1_Bundle.smallImageName, 'small_image')}}" stepKey="seeSmallImageRoleSimple1"/>
114+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct1ThumbnailImageOnEditPage">
115+
<argument name="image" value="{{ImportProductSimple1_Bundle.thumbnailImageName}}"/>
110116
</actionGroup>
111-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(MagentoLogo.filename, 'thumbnail')}}" stepKey="seeThumbnailImageRoleSimple1"/>
117+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple1_Bundle.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRoleSimple1"/>
112118

113119
<!-- Admin: Verify Simple Product 2 on Edit Product Page -->
114120
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="goToSimpleProduct2EditPage">
@@ -124,18 +130,18 @@
124130
<argument name="productWeight" value="{{ImportProductSimple2_Bundle.weight}}"/>
125131
<argument name="categoryName" value="{{ImportCategory_Bundle.name}}"/>
126132
</actionGroup>
127-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct2ImageOnEditPage">
128-
<argument name="image" value="TestImage"/>
133+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct2ImageOnEditPage">
134+
<argument name="image" value="{{ImportProductSimple2_Bundle.baseImageName}}"/>
129135
</actionGroup>
130-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImage.filename, 'image')}}" stepKey="seeBaseImageRoleSimple2"/>
131-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct2SmallImageOnEditPage">
132-
<argument name="image" value="TestImage"/>
136+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple2_Bundle.baseImageName, 'image')}}" stepKey="seeBaseImageRoleSimple2"/>
137+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct2SmallImageOnEditPage">
138+
<argument name="image" value="{{ImportProductSimple2_Bundle.smallImageName}}"/>
133139
</actionGroup>
134-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImage.filename, 'small_image')}}" stepKey="seeSmallImageRoleSimple2"/>
135-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct2ThumbnailImageOnEditPage">
136-
<argument name="image" value="TestImage"/>
140+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple2_Bundle.smallImageName, 'small_image')}}" stepKey="seeSmallImageRoleSimple2"/>
141+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct2ThumbnailImageOnEditPage">
142+
<argument name="image" value="{{ImportProductSimple2_Bundle.thumbnailImageName}}"/>
137143
</actionGroup>
138-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImage.filename, 'thumbnail')}}" stepKey="seeThumbnailImageRoleSimple2"/>
144+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple2_Bundle.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRoleSimple2"/>
139145

140146
<!-- Admin: Verify Simple Product 3 on Edit Product Page -->
141147
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="goToSimpleProduct3EditPage">
@@ -151,18 +157,18 @@
151157
<argument name="productWeight" value="{{ImportProductSimple3_Bundle.weight}}"/>
152158
<argument name="categoryName" value="{{ImportCategory_Bundle.name}}"/>
153159
</actionGroup>
154-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct3ImageOnEditPage">
155-
<argument name="image" value="TestImageAdobe"/>
160+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct3ImageOnEditPage">
161+
<argument name="image" value="{{ImportProductSimple3_Bundle.baseImageName}}"/>
156162
</actionGroup>
157-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImageAdobe.filename, 'image')}}" stepKey="seeBaseImageRoleSimple3"/>
158-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct3SmallImageOnEditPage">
159-
<argument name="image" value="TestImageAdobe"/>
163+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple3_Bundle.baseImageName, 'image')}}" stepKey="seeBaseImageRoleSimple3"/>
164+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct3SmallImageOnEditPage">
165+
<argument name="image" value="{{ImportProductSimple3_Bundle.smallImageName}}"/>
160166
</actionGroup>
161-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImageAdobe.filename, 'small_image')}}" stepKey="seeSmallImageRoleSimple3"/>
162-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertSimpleProduct3ThumbnailImageOnEditPage">
163-
<argument name="image" value="TestImageAdobe"/>
167+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple3_Bundle.smallImageName, 'small_image')}}" stepKey="seeSmallImageRoleSimple3"/>
168+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertSimpleProduct3ThumbnailImageOnEditPage">
169+
<argument name="image" value="{{ImportProductSimple3_Bundle.thumbnailImageName}}"/>
164170
</actionGroup>
165-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImageAdobe.filename, 'thumbnail')}}" stepKey="seeThumbnailImageRoleSimple3"/>
171+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProductSimple3_Bundle.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRoleSimple3"/>
166172

167173
<!-- Admin: Verify Bundle Product Common Data on Edit Product Page -->
168174
<actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="goToBundleProductEditPage">
@@ -179,20 +185,20 @@
179185
<argument name="productQuantity" value="{{ImportProduct_Bundle.quantity}}"/>
180186
<argument name="productWeight" value="{{ImportProduct_Bundle.weight}}"/>
181187
<argument name="dynamicWeight" value="{{ImportProduct_Bundle.dynamicWeightCheckedValue}}"/>
182-
<argument name="categoryNames" value="{{ImportCategory_Bundle.name}}"/>
188+
<argument name="categoryName" value="{{ImportCategory_Bundle.name}}"/>
183189
</actionGroup>
184-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertBundleProductBaseImageOnEditPage">
185-
<argument name="image" value="MagentoLogo"/>
190+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertBundleProductBaseImageOnEditPage">
191+
<argument name="image" value="{{ImportProduct_Bundle.baseImageName}}"/>
186192
</actionGroup>
187-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(MagentoLogo.filename, 'image')}}" stepKey="seeBaseImageRoleBundle"/>
188-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertBundleProductSmallImageOnEditPage">
189-
<argument name="image" value="TestImage"/>
193+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProduct_Bundle.baseImageName, 'image')}}" stepKey="seeBaseImageRoleBundle"/>
194+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertBundleProductSmallImageOnEditPage">
195+
<argument name="image" value="{{ImportProduct_Bundle.smallImageName}}"/>
190196
</actionGroup>
191-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImage.filename, 'small_image')}}" stepKey="seeSmallImageRoleBundle"/>
192-
<actionGroup ref="AssertProductImageAdminProductPageActionGroup" stepKey="assertBundleProductThumbnailImageOnEditPage">
193-
<argument name="image" value="TestImageAdobe"/>
197+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProduct_Bundle.smallImageName, 'small_image')}}" stepKey="seeSmallImageRoleBundle"/>
198+
<actionGroup ref="AdminAssertProductImageOnProductPageActionGroup" stepKey="assertBundleProductThumbnailImageOnEditPage">
199+
<argument name="image" value="{{ImportProduct_Bundle.thumbnailImageName}}"/>
194200
</actionGroup>
195-
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(TestImageAdobe.filename, 'thumbnail')}}" stepKey="seeThumbnailImageRoleBundle"/>
201+
<seeElement selector="{{AdminProductImagesSection.imageFileRoleByImage(ImportProduct_Bundle.thumbnailImageName, 'thumbnail')}}" stepKey="seeThumbnailImageRoleBundle"/>
196202

197203
<!-- Admin: Verify Bundle Product Information on Edit Product Page -->
198204
<seeOptionIsSelected userInput="{{ImportProduct_Bundle.bundleOptionShipmentType}}" selector="{{AdminProductFormBundleSection.shipmentType}}" stepKey="seeShipBundleItemsTogether"/>
@@ -259,9 +265,9 @@
259265
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{ImportProduct_Bundle.name}}" stepKey="seeProductName"/>
260266
<see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{ImportProduct_Bundle.sku}}" stepKey="seeSku"/>
261267
<see userInput="From $20.00 To $170.00" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="seePrice"/>
262-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(MagentoLogo.filename)}}" stepKey="seeMagentoLogo"/>
263-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(TestImage.filename)}}" stepKey="seeTestImage"/>
264-
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(TestImageAdobe.filename)}}" stepKey="seeTestImageAdobe"/>
268+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple1_Bundle.baseImageName)}}" stepKey="seeProduct1BaseImage"/>
269+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple2_Bundle.baseImageName)}}" stepKey="seeProduct2BaseImage"/>
270+
<seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ImportProductSimple3_Bundle.baseImageName)}}" stepKey="seeProduct3BaseImage"/>
265271

266272
<!-- Storefront: Verify Default Customization Summary -->
267273
<actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickCustomizeAndAddToCartButton"/>

0 commit comments

Comments
 (0)