Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
mage-os-ci committed Nov 12, 2024
2 parents af940da + fdf409a commit 3b6ac05
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright 2024 Adobe
* All Rights Reserved.
*/
-->
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="AdminConfigurableProductImageUploadTest">
<annotations>
<features value="Inventory"/>
<stories value="Inventory"/>
<title value="Adding images to configurable not working when MSI is enabled."/>
<description value="Admin should be able to use Image Uploader to add Gallery Images for Configurable Products."/>
<useCaseId value="ACP2E-3357"/>
<testCaseId value="AC-13228"/>
<severity value="AVERAGE"/>
</annotations>
<before>
<createData entity="FullSource1" stepKey="createSource1"/>
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock1"/>

<createData entity="SourceStockLinked1" stepKey="linkSourceStock1">
<requiredEntity createDataKey="createStock1"/>
<requiredEntity createDataKey="createSource1"/>
</createData>

<!--Create product attribute with options-->
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
<requiredEntity createDataKey="createConfigProductAttribute"/>
</createData>
<createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
<requiredEntity createDataKey="createConfigProductAttribute"/>
</createData>
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
<requiredEntity createDataKey="createConfigProductAttribute"/>
</createData>
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
<requiredEntity createDataKey="createConfigProductAttribute"/>
</getData>
<getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
<requiredEntity createDataKey="createConfigProductAttribute"/>
</getData>

<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
</before>
<after>
<!--Assign Default Stock to Default Website.-->
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
<argument name="stockName" value="{{_defaultStock.name}}"/>
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
</actionGroup>

<!--Clean up attribute-->
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>

<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
</after>

<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnTheCategoryPage1"/>
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>

<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnTheAddProductToggle1"/>
<click selector="{{AdminProductGridActionSection.addTypeProduct('configurable')}}" stepKey="clickOnAddConfigurableProduct1"/>
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>

<fillField userInput="{{ConfigurableMsiProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName1"/>
<fillField userInput="{{ConfigurableMsiProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillProductPrice1"/>
<fillField userInput="{{ConfigurableMsiProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillProductSku1"/>
<fillField userInput="{{ConfigurableMsiProduct.quantity}}" selector="{{AdminConfigurableProductFormSection.productQuantity}}" stepKey="fillProductQuantity1"/>

<!--Create configuration-->
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton1"/>
<waitForPageLoad stepKey="waitForPageLoad4"/>

<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
<fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="$$createConfigProductAttribute.attribute_code$$" stepKey="fillFilterAttributeCodeField"/>
<click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
<checkOption selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
<click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>

<!--Images, price and quantity configuration-->
<click selector="{{AdminCreateProductConfigurationsPanel.applySingleSetOfImages}}" stepKey="clickOnApplySingleImageSetToAllSku"/>
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageUploadButton}}" stepKey="seeImageSectionIsReady" after="clickOnApplySingleImageSetToAllSku"/>
<attachFile selector="{{AdminCreateProductConfigurationsPanel.imageFileUpload}}" userInput="{{TestImageAdobe.file}}" stepKey="uploadFile" after="seeImageSectionIsReady"/>
<waitForElementNotVisible selector="{{AdminCreateProductConfigurationsPanel.uploadProgressBar}}" stepKey="waitForUpload" after="uploadFile"/>
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.imageFile(TestImageAdobe.fileName)}}" stepKey="waitForThumbnail" after="waitForUpload"/>
</test>
</tests>
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@
<div data-role="uploader" class="uploader">
<div class="image-browse">
<span><?= $block->escapeHtml(__('Browse Files...')) ?></span>
<input type="file"
id=""
name="image"
class="admin__control-file"
multiple="multiple"
data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
<span class="browse-file" data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>"></span>
</div>
</div>
<div class="product-image-wrapper">
Expand Down Expand Up @@ -351,8 +346,7 @@
<span><?= $block->escapeHtml(
__('Browse Files...')
); ?></span>
<input type="file" name="image" multiple="multiple"
data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
<span class="browse-file" data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>"></span>
</div>
</div>
<div class="product-image-wrapper">
Expand Down

0 comments on commit 3b6ac05

Please sign in to comment.