Skip to content

Commit d5715d4

Browse files
glo71317glo71317
committed
Merge remote-tracking branch 'origin/develop' into Hammer-Plateform-Health-05Nov24
2 parents be91c94 + fdf409a commit d5715d4

File tree

2 files changed

+95
-8
lines changed

2 files changed

+95
-8
lines changed

‎InventoryConfigurableProductAdminUi/Test/Mftf/Test/AdminConfigurableProductImageUploadTest.xml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminConfigurableProductImageUploadTest">
11+
<annotations>
12+
<features value="Inventory"/>
13+
<stories value="Inventory"/>
14+
<title value="Adding images to configurable not working when MSI is enabled."/>
15+
<description value="Admin should be able to use Image Uploader to add Gallery Images for Configurable Products."/>
16+
<useCaseId value="ACP2E-3357"/>
17+
<testCaseId value="AC-13228"/>
18+
<severity value="AVERAGE"/>
19+
</annotations>
20+
<before>
21+
<createData entity="FullSource1" stepKey="createSource1"/>
22+
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock1"/>
23+
24+
<createData entity="SourceStockLinked1" stepKey="linkSourceStock1">
25+
<requiredEntity createDataKey="createStock1"/>
26+
<requiredEntity createDataKey="createSource1"/>
27+
</createData>
28+
29+
<!--Create product attribute with options-->
30+
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
31+
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
32+
<requiredEntity createDataKey="createConfigProductAttribute"/>
33+
</createData>
34+
<createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
35+
<requiredEntity createDataKey="createConfigProductAttribute"/>
36+
</createData>
37+
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
38+
<requiredEntity createDataKey="createConfigProductAttribute"/>
39+
</createData>
40+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
41+
<requiredEntity createDataKey="createConfigProductAttribute"/>
42+
</getData>
43+
<getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
44+
<requiredEntity createDataKey="createConfigProductAttribute"/>
45+
</getData>
46+
47+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
48+
</before>
49+
<after>
50+
<!--Assign Default Stock to Default Website.-->
51+
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
52+
<argument name="stockName" value="{{_defaultStock.name}}"/>
53+
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
54+
</actionGroup>
55+
56+
<!--Clean up attribute-->
57+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
58+
59+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
60+
</after>
61+
62+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnTheCategoryPage1"/>
63+
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
64+
65+
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnTheAddProductToggle1"/>
66+
<click selector="{{AdminProductGridActionSection.addTypeProduct('configurable')}}" stepKey="clickOnAddConfigurableProduct1"/>
67+
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
68+
69+
<fillField userInput="{{ConfigurableMsiProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName1"/>
70+
<fillField userInput="{{ConfigurableMsiProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice1"/>
71+
<fillField userInput="{{ConfigurableMsiProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSku1"/>
72+
<fillField userInput="{{ConfigurableMsiProduct.quantity}}" selector="{{AdminConfigurableProductFormSection.productQuantity}}" stepKey="fillProductQuantity1"/>
73+
74+
<!--Create configuration-->
75+
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton1"/>
76+
<waitForPageLoad stepKey="waitForPageLoad4"/>
77+
78+
<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
79+
<fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="$$createConfigProductAttribute.attribute_code$$" stepKey="fillFilterAttributeCodeField"/>
80+
<click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
81+
<checkOption selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
82+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
83+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
84+
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
85+
86+
<!--Images, price and quantity configuration-->
87+
<click selector="{{AdminCreateProductConfigurationsPanel.applySingleSetOfImages}}" stepKey="clickOnApplySingleImageSetToAllSku"/>
88+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageUploadButton}}" stepKey="seeImageSectionIsReady" after="clickOnApplySingleImageSetToAllSku"/>
89+
<attachFile selector="{{AdminCreateProductConfigurationsPanel.imageFileUpload}}" userInput="{{TestImageAdobe.file}}" stepKey="uploadFile" after="seeImageSectionIsReady"/>
90+
<waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}" stepKey="waitForUpload" after="uploadFile"/>
91+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageFile(TestImageAdobe.fileName)}}" stepKey="waitForThumbnail" after="waitForUpload"/>
92+
</test>
93+
</tests>

‎InventoryConfigurableProductAdminUi/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,7 @@
7979
<div data-role="uploader" class="uploader">
8080
<div class="image-browse">
8181
<span><?= $block->escapeHtml(__('Browse Files...')) ?></span>
82-
<input type="file"
83-
id=""
84-
name="image"
85-
class="admin__control-file"
86-
multiple="multiple"
87-
data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
82+
<span class="browse-file" data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>"></span>
8883
</div>
8984
</div>
9085
<div class="product-image-wrapper">
@@ -351,8 +346,7 @@
351346
<span><?= $block->escapeHtml(
352347
__('Browse Files...')
353348
); ?></span>
354-
<input type="file" name="image" multiple="multiple"
355-
data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
349+
<span class="browse-file" data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>"></span>
356350
</div>
357351
</div>
358352
<div class="product-image-wrapper">

0 commit comments

Comments
 (0)