Skip to content

Commit 793c72d

Browse files
nathanjosiahnathanjosiah
committed
MAGETWO-95934: Can't upload Watermark Image
- Fixed ui component element type - Added mftf test
1 parent 069d5cd commit 793c72d

File tree

6 files changed

+98
-4
lines changed

6 files changed

+98
-4
lines changed

‎app/code/Magento/Catalog/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<level>2</level>
1919
<label translate="true">Base</label>
2020
</settings>
21-
<field name="watermark_image_image" formElement="fileUploader">
21+
<field name="watermark_image_image" formElement="imageUploader">
2222
<settings>
2323
<notice translate="true">Allowed file types: jpeg, gif, png.</notice>
2424
<label translate="true">Image</label>
@@ -78,7 +78,7 @@
7878
<level>2</level>
7979
<label translate="true">Thumbnail</label>
8080
</settings>
81-
<field name="watermark_thumbnail_image" formElement="fileUploader">
81+
<field name="watermark_thumbnail_image" formElement="imageUploader">
8282
<settings>
8383
<label translate="true">Image</label>
8484
<componentType>imageUploader</componentType>
@@ -137,7 +137,7 @@
137137
<level>2</level>
138138
<label translate="true">Small</label>
139139
</settings>
140-
<field name="watermark_small_image_image" formElement="fileUploader">
140+
<field name="watermark_small_image_image" formElement="imageUploader">
141141
<settings>
142142
<label translate="true">Image</label>
143143
<componentType>imageUploader</componentType>

‎app/code/Magento/Swatches/Test/Mftf/Test/AdminWatermarkUploadTest.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminWatermarkUploadTest">
12+
<waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Swatch Image')}}" stepKey="waitForInputVisible4" after="waitForPreviewImage3"/>
13+
<attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Swatch Image')}}" userInput="adobe-small.jpg" stepKey="attachFile4" after="waitForInputVisible4"/>
14+
<waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Swatch Image')}}" stepKey="waitForPreviewImage4" after="attachFile4"/>
15+
</test>
16+
</tests>

‎app/code/Magento/Swatches/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<level>2</level>
1414
<label translate="true">Swatch Image</label>
1515
</settings>
16-
<field name="watermark_swatch_image_image" formElement="fileUploader">
16+
<field name="watermark_swatch_image_image" formElement="imageUploader">
1717
<settings>
1818
<label translate="true">Image</label>
1919
<componentType>imageUploader</componentType>

‎app/code/Magento/Theme/Test/Mftf/Page/DesignConfigPage.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
11+
<page name="DesignConfigPage" url="theme/design_config/" area="admin" module="Magento_Theme">
12+
<section name="AdminDesignConfigSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Theme/Test/Mftf/Section/AdminDesignConfigSection.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminDesignConfigSection">
12+
<element name="scopeRow" type="button" selector="//*[contains(@class,'data-row')][{{arg1}}]//*[contains(@class,'action-menu-item')]" parameterized="true"/>
13+
<element name="watermarkSectionHeader" type="text" selector="[data-index='watermark']"/>
14+
<element name="watermarkSection" type="text" selector="[data-index='watermark'] .admin__fieldset-wrapper-content"/>
15+
<element name="imageUploadInputByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader')]//input" parameterized="true"/>
16+
<element name="imageUploadPreviewByFieldsetName" type="input" selector="//*[contains(@class,'fieldset-wrapper')][child::*[contains(@class,'fieldset-wrapper-title')]//*[contains(text(),'{{arg1}}')]]//*[contains(@class,'file-uploader-preview')]//img" parameterized="true"/>
17+
</section>
18+
</sections>

‎app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminWatermarkUploadTest">
12+
<annotations>
13+
<features value="Watermark"/>
14+
<stories value="Watermark"/>
15+
<title value="MAGETWO-95934: Can't upload Watermark Image"/>
16+
<description value="Watermark images should be able to be uploaded in the admin"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MAGETWO-95934"/>
19+
<group value="Watermark"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginToAdminArea"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
26+
</after>
27+
<amOnPage url="{{DesignConfigPage.url}}" stepKey="navigateToDesignConfigPage" />
28+
<waitForPageLoad stepKey="waitForPageload1"/>
29+
<click selector="{{AdminDesignConfigSection.scopeRow('3')}}" stepKey="editStoreView"/>
30+
<waitForPageLoad stepKey="waitForPageload2"/>
31+
<scrollTo selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="scrollToWatermarkSection"/>
32+
<click selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="openWatermarkSection"/>
33+
34+
<waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Base')}}" stepKey="waitForInputVisible1"/>
35+
<attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Base')}}" userInput="adobe-base.jpg" stepKey="attachFile1"/>
36+
<waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Base')}}" stepKey="waitForPreviewImage"/>
37+
38+
<waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Thumbnail')}}" stepKey="waitForInputVisible2"/>
39+
<attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Thumbnail')}}" userInput="adobe-thumb.jpg" stepKey="attachFile2"/>
40+
<waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Thumbnail')}}" stepKey="waitForPreviewImage2"/>
41+
42+
<waitForElement selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Small')}}" stepKey="waitForInputVisible3"/>
43+
<attachFile selector="{{AdminDesignConfigSection.imageUploadInputByFieldsetName('Small')}}" userInput="adobe-small.jpg" stepKey="attachFile3"/>
44+
<waitForElementVisible selector="{{AdminDesignConfigSection.imageUploadPreviewByFieldsetName('Small')}}" stepKey="waitForPreviewImage3"/>
45+
</test>
46+
</tests>

0 commit comments

Comments
 (0)