Skip to content

Commit 364d17e

Browse files
MorozovaNPMorozovaNP
committed
Merge branch 'MC-18824_2' into MC-18824_MC-15759
2 parents 8b69f2d + feda0a9 commit 364d17e

15 files changed

+432
-2
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,20 @@
6767
<entity name="ProductWithSpecialSymbols" extends="SimpleProduct" type="product">
6868
<data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
6969
</entity>
70+
<entity name="SimpleProductBeforeUpdate" type="product">
71+
<data key="sku">simpleProduct</data>
72+
<data key="type_id">simple</data>
73+
<data key="attribute_set_id">4</data>
74+
<data key="name" unique="suffix">SimpleProduct</data>
75+
<data key="price">123.00</data>
76+
<data key="visibility">4</data>
77+
<data key="status">1</data>
78+
<data key="quantity">1000</data>
79+
<data key="urlKey">simpleProduct</data>
80+
<data key="weight">1</data>
81+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
82+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
83+
</entity>
7084
<entity name="SimpleProductAfterImport1" type="product">
7185
<data key="sku">SimpleProductForTest1</data>
7286
<data key="type_id">simple</data>
@@ -1029,6 +1043,10 @@
10291043
<entity name="productAlphabeticalB" type="product" extends="_defaultProduct">
10301044
<data key="name" unique="suffix">BBB Product</data>
10311045
</entity>
1046+
<entity name="simpleProductWithShortNameAndSku" type="product" extends="defaultSimpleProduct">
1047+
<data key="name">Simple_Product</data>
1048+
<data key="sku">testsku</data>
1049+
</entity>
10321050
<entity name="productWithSpecialCharacters" type="product" extends="_defaultProduct">
10331051
<data key="name" unique="suffix">Product "!@#$%^&amp;*()+:;\|}{][?=~` </data>
10341052
<data key="nameWithSafeChars" unique="suffix">|}{][?=~` </data>

‎app/code/Magento/ImportExport/Test/Mftf/ActionGroup/AdminImportProductsActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<argument name="validationStrategy" type="string" defaultValue="Stop on Error"/>
1818
<argument name="allowedErrorsCount" type="string" defaultValue="10"/>
1919
<argument name="importFile" type="string"/>
20-
<argument name="importNoticeMessage" type="string"/>
20+
<argument name="importNoticeMessage" type="string" defaultValue=""/>
2121
<argument name="importMessageType" type="string" defaultValue="success"/>
2222
<argument name="importMessage" type="string" defaultValue="Import successfully done"/>
2323
</arguments>

‎app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminImportHeaderSection">
1212
<element name="checkDataButton" type="button" selector="#upload_button" timeout="30"/>
13+
<element name="messageNote" type="text" selector="#import_file-note" timeout="30"/>
1314
</section>
1415
</sections>

‎app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
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="AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest">
12+
<annotations>
13+
<features value="Import/Export"/>
14+
<stories value="Attribute importing"/>
15+
<title value="Check that some attributes changed the value to an empty after import CSV"/>
16+
<description value="Check that some attributes changed the value to an empty after import CSV"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-11332"/>
19+
<useCaseId value="MAGETWO-61593"/>
20+
<group value="importExport"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<createData entity="productDropDownAttribute" stepKey="productAttribute"/>
25+
<createData entity="productAttributeOption2" stepKey="attributeOptionWithDefaultValue">
26+
<requiredEntity createDataKey="productAttribute"/>
27+
</createData>
28+
<!--Create category-->
29+
<createData entity="_defaultCategory" stepKey="createCategory"/>
30+
</before>
31+
<after>
32+
<!--Delete Product and Category-->
33+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
34+
<waitForPageLoad stepKey="waitForProductGridPageLoad"/>
35+
<actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
36+
<argument name="productName" value="simpleProductWithShortNameAndSku.name"/>
37+
</actionGroup>
38+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
39+
<!--Delete attribute-->
40+
<deleteData createDataKey="productAttribute" stepKey="deleteProductAttribute"/>
41+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
42+
</after>
43+
<!--Create product-->
44+
<actionGroup ref="GoToSpecifiedCreateProductPage" stepKey="openProductFillForm"/>
45+
<actionGroup ref="fillMainProductForm" stepKey="fillProductFieldsInAdmin">
46+
<argument name="product" value="simpleProductWithShortNameAndSku"/>
47+
</actionGroup>
48+
<actionGroup ref="SetCategoryByName" stepKey="addCategoryToProduct">
49+
<argument name="categoryName" value="$$createCategory.name$$"/>
50+
</actionGroup>
51+
<!--Select created attribute-->
52+
<actionGroup ref="addProductAttributeInProductModal" stepKey="addAttributeToProduct">
53+
<argument name="attributeCode" value="$$productAttribute.attribute_code$$"/>
54+
</actionGroup>
55+
<!--Check that attribute value is selected-->
56+
<scrollTo selector="{{AdminProductFormSection.attributeTab}}" stepKey="scrollToAttributeTitle1"/>
57+
<conditionalClick selector="{{AdminProductFormSection.attributeTab}}" dependentSelector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" visible="false" stepKey="expandAttributeTab1"/>
58+
<seeOptionIsSelected selector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" userInput="option2" stepKey="seeAttributeValueIsSelected1"/>
59+
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
60+
<!--Import product with add/update behavior-->
61+
<actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsFirstTime">
62+
<argument name="behavior" value="Add/Update"/>
63+
<argument name="importFile" value="import_simple_product.csv"/>
64+
<argument name="importNoticeMessage" value="Created: 0, Updated: 1, Deleted: 0"/>
65+
</actionGroup>
66+
<!--Check that attribute value is empty after import-->
67+
<actionGroup ref="filterAndSelectProduct" stepKey="filterAndSelectTheProduct2">
68+
<argument name="productSku" value="{{simpleProductWithShortNameAndSku.sku}}"/>
69+
</actionGroup>
70+
<scrollTo selector="{{AdminProductFormSection.attributeTab}}" stepKey="scrollToAttributeTitle2"/>
71+
<conditionalClick selector="{{AdminProductFormSection.attributeTab}}" dependentSelector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" visible="false" stepKey="expandAttributeTab2"/>
72+
<seeOptionIsSelected selector="{{AdminProductAttributeSection.dropDownAttribute($$productAttribute.attribute_code$$)}}" userInput="" stepKey="seeAttributeValueIsSelected2"/>
73+
</test>
74+
</tests>

‎app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportCSVWithSpecialCharactersTest.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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="AdminImportCSVWithSpecialCharactersTest">
12+
<annotations>
13+
<features value="Import/Export"/>
14+
<stories value="Import CSV file"/>
15+
<title value="Import CSV with special characters"/>
16+
<description value="Import CSV with special characters"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-6416"/>
19+
<useCaseId value="MAGETWO-91569"/>
20+
<group value="importExport"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
27+
</after>
28+
<actionGroup ref="AdminCheckDataForImportProductActionGroup" stepKey="adminImportProducts">
29+
<argument name="behavior" value="Add/Update"/>
30+
<argument name="importFile" value="importSpecChars.csv"/>
31+
</actionGroup>
32+
<see selector="{{AdminImportHeaderSection.messageNote}}" userInput='File must be saved in UTF-8 encoding for proper import' stepKey="seeNoteMessage"/>
33+
<see selector="{{AdminMessagesSection.successMessage}}" userInput='File is valid! To start import process press "Import" button' stepKey="seeSuccessMessage"/>
34+
</test>
35+
</tests>

‎app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductVisibilityDifferentStoreViewsAfterImportTest.xml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
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="AdminProductVisibilityDifferentStoreViewsAfterImportTest">
12+
<annotations>
13+
<features value="Import/Export"/>
14+
<stories value="Import Products"/>
15+
<title value="Checking product visibility in different store views after product importing"/>
16+
<description value="Checking product visibility in different store views after product importing"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-6406"/>
19+
<useCaseId value="MAGETWO-59265"/>
20+
<group value="importExport"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<!--Create English and Chinese store views-->
25+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createEnglishStoreView">
26+
<argument name="StoreGroup" value="_defaultStoreGroup"/>
27+
<argument name="customStore" value="customStoreEN"/>
28+
</actionGroup>
29+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createChineseStoreView">
30+
<argument name="StoreGroup" value="_defaultStoreGroup"/>
31+
<argument name="customStore" value="storeViewChinese"/>
32+
</actionGroup>
33+
</before>
34+
<after>
35+
<!--Delete all imported products-->
36+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
37+
<actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
38+
<actionGroup ref="adminDataGridSelectPerPage" stepKey="selectNumberOfProductsPerPage">
39+
<argument name="perPage" value="100"/>
40+
</actionGroup>
41+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
42+
<!--Delete store views-->
43+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteEnglishStoreView">
44+
<argument name="customStore" value="customStoreEN"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteChineseStoreView">
47+
<argument name="customStore" value="storeViewChinese"/>
48+
</actionGroup>
49+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
50+
</after>
51+
<!--Import products from file-->
52+
<actionGroup ref="AdminImportProductsActionGroup" stepKey="importProducts">
53+
<argument name="behavior" value="Add/Update"/>
54+
<argument name="importFile" value="import_productsoftwostoresdata.csv"/>
55+
<argument name="importNoticeMessage" value="Created: 2, Updated: 0, Deleted: 0"/>
56+
</actionGroup>
57+
<!--Open imported name4 product-->
58+
<actionGroup ref="filterAndSelectProduct" stepKey="openName4Product">
59+
<argument name="productSku" value="name4"/>
60+
</actionGroup>
61+
<!--Switch Chinese store view and assert visibility field-->
62+
<comment userInput="Switch Chinese store view and assert visibility field" stepKey="commentAssertVisibilityChineseView"/>
63+
<actionGroup ref="SwitchToTheNewStoreView" stepKey="switchToCustomStoreView">
64+
<argument name="storeViewName" value="{{storeViewChinese.name}}"/>
65+
</actionGroup>
66+
<seeInField selector="{{AdminProductFormSection.visibility}}" userInput="Catalog" stepKey="seeVisibilityFieldForChineseStore"/>
67+
<!--Switch English store view and assert visibility field-->
68+
<actionGroup ref="SwitchToTheNewStoreView" stepKey="switchToCustomEnglishView">
69+
<argument name="storeViewName" value="{{customStoreEN.name}}"/>
70+
</actionGroup>
71+
<seeInField selector="{{AdminProductFormSection.visibility}}" userInput="Catalog" stepKey="seeVisibilityFieldForEnglishView"/>
72+
</test>
73+
</tests>

‎app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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="AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest">
12+
<annotations>
13+
<features value="Import/Export"/>
14+
<stories value="Import Products"/>
15+
<title value="Check that new URL Key works after updating a product through importing CSV file"/>
16+
<description value="Check that new URL Key works after updating a product through importing CSV file"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-6317"/>
19+
<useCaseId value="MAGETWO-91544"/>
20+
<group value="importExport"/>
21+
</annotations>
22+
<before>
23+
<!--Create Product-->
24+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
25+
<createData entity="SimpleProductBeforeUpdate" stepKey="createProduct">
26+
<requiredEntity createDataKey="createCategory"/>
27+
</createData>
28+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
29+
</before>
30+
<after>
31+
<!--Delete created data-->
32+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
33+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
34+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
35+
</after>
36+
<!--Import product from CSV file-->
37+
<actionGroup ref="AdminImportProductsActionGroup" stepKey="importProduct">
38+
<argument name="behavior" value="Add/Update"/>
39+
<argument name="importFile" value="simpleProductUpdate.csv"/>
40+
<argument name="importNoticeMessage" value="Created: 0, Updated: 1, Deleted: 0"/>
41+
</actionGroup>
42+
<!--Assert product's updated url-->
43+
<amOnPage url="{{StorefrontProductPage.url('simpleprod')}}" stepKey="navigateToProductPage"/>
44+
<waitForPageLoad stepKey="waitForProductPageLoad"/>
45+
<seeInCurrentUrl url="{{StorefrontProductPage.url('simpleprod')}}" stepKey="seeUpdatedUrl"/>
46+
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="assertProductName"/>
47+
<see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createProduct.sku$$" stepKey="assertProductSku"/>
48+
</test>
49+
</tests>

‎app/code/Magento/Store/Test/Mftf/Data/StoreData.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,13 @@
197197
<data key="name">third_store_view</data>
198198
<data key="code">third_store_view</data>
199199
</entity>
200+
<entity name="storeViewChinese" type="store">
201+
<data key="group_id">1</data>
202+
<data key="name">Chinese</data>
203+
<data key="code">chinese</data>
204+
<data key="is_active">1</data>
205+
<data key="store_id">null</data>
206+
<data key="store_type">store</data>
207+
<data key="store_action">add</data>
208+
</entity>
200209
</entities>

‎dev/tests/acceptance/tests/_data/importSpecChars.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
2+
Mug,,Default,simple,Default Category/C1,base,Mug,<p>this is a � � � mug</p>,,,1,Taxable Goods,"Catalog, Search",30,,,,mug,Mug,Mug,Mug ,,,,,,,,,"10/1/18, 9:21 PM","10/1/18, 11:30 PM",,,Block after Info Column,,,,Use config,,,,,,,,,gift_wrapping_available=Use config,99,0,1,0,0,1,1,1,10000,1,1,1,1,1,1,1,1,1,0,0,0,1,1,,,,,,,,,,,,,,,,,,,

‎dev/tests/acceptance/tests/_data/import_productsoftwostoresdata.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,msrp_price,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id
2+
name4,,Default,simple,,base,name4,name4,name4,0,1,None,Catalog,39,1,7/8/2015 8:00,,name4,,,,12/16/2015 6:33,7/7/2016 13:01,,,Product Info Column,,,,,,,,Use config,,,1,0,1,0,0,0,1,1,10000,1,1,1,1,1,1,1,0,1,0,0,1
3+
name4,english,Default,simple,,base,, ,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4+
name4,chinese,Default,simple,,base,白瓷奶勺110厘米, ,白瓷奶勺110厘米,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
5+
name5,,Default,simple,,base,name5,name5,name5,0,1,,Catalog,229,111.75,7/15/2015 0:00,,name5,,,,12/16/2015 6:33,7/7/2016 13:01,,,Product Info Column,,,,,,,,Use config,,,0,0,1,0,2,2,1,1,10000,1,1,1,1,1,1,1,0,1,0,0,1
6+
name5,chinese,Default,simple,,base,盐磨瓶18厘米,,盐磨瓶18厘米,,2,None,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
7+
name5,english,Default,simple,,base,,,,,2,None,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,

0 commit comments

Comments
 (0)