Skip to content

Commit ea3c00b

Browse files
author
OlgaVasyltsun
committed
Merge remote-tracking branch 'origin/MC-6358' into 2.3-develop-pr74
2 parents 20cf4a0 + 248c682 commit ea3c00b

9 files changed

+123
-12
lines changed

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,36 @@
1414
</annotations>
1515
<arguments>
1616
<argument name="behavior" type="string"/>
17+
<argument name="validationStrategy" type="string" defaultValue="Stop on Error"/>
18+
<argument name="allowedErrorsCount" type="string" defaultValue="10"/>
1719
<argument name="importFile" type="string"/>
18-
<argument name="importMessage" type="string"/>
20+
<argument name="importNoticeMessage" type="string"/>
21+
<argument name="importMessageType" type="string" defaultValue="success"/>
22+
<argument name="importMessage" type="string" defaultValue="Import successfully done"/>
1923
</arguments>
2024

2125
<amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
22-
<waitForPageLoad stepKey="AdminImportMainSectionLoad"/>
26+
<waitForPageLoad stepKey="adminImportMainSectionLoad"/>
2327
<selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
2428
<waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
25-
<selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportOption"/>
29+
<selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="{{behavior}}" stepKey="selectImportBehaviorOption"/>
30+
<selectOption selector="{{AdminImportMainSection.validationStrategy}}" userInput="{{validationStrategy}}" stepKey="selectValidationStrategyOption"/>
31+
<fillField selector="{{AdminImportMainSection.allowedErrorsCount}}" userInput="{{allowedErrorsCount}}" stepKey="fillAllowedErrorsCountField"/>
2632
<attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="{{importFile}}" stepKey="attachFileForImport"/>
2733
<click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
2834
<click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
29-
<waitForPageLoad stepKey="AdminImportMainSectionLoad2"/>
30-
<see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
31-
<waitForPageLoad stepKey="AdminMessagesSection"/>
32-
<see selector="{{AdminMessagesSection.notice}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
35+
<waitForElementVisible selector="{{AdminImportValidationMessagesSection.notice}}" stepKey="waitForNoticeMessage"/>
36+
<see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{importNoticeMessage}}" stepKey="seeNoticeMessage"/>
37+
<see selector="{{AdminImportValidationMessagesSection.messageByType(importMessageType)}}" userInput="{{importMessage}}" stepKey="seeImportMessage"/>
38+
</actionGroup>
39+
40+
<actionGroup name="AdminImportProductsWithCheckValidationResultActionGroup" extends="AdminImportProductsActionGroup">
41+
<arguments>
42+
<argument name="validationNoticeMessage" type="string"/>
43+
<argument name="validationMessage" type="string" defaultValue="File is valid! To start import process press &quot;Import&quot; button"/>
44+
</arguments>
45+
<waitForElementVisible selector="{{AdminImportValidationMessagesSection.notice}}" after="clickCheckDataButton" stepKey="waitForValidationNoticeMessage"/>
46+
<see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{validationNoticeMessage}}" after="waitForValidationNoticeMessage" stepKey="seeValidationNoticeMessage"/>
47+
<see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{validationMessage}}" after="seeValidationNoticeMessage" stepKey="seeValidationMessage"/>
3348
</actionGroup>
3449
</actionGroups>

‎app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<page name="AdminImportIndexPage" url="admin/import/" area="admin" module="Magento_ImportExport">
1212
<section name="AdminImportHeaderSection"/>
1313
<section name="AdminImportMainSection"/>
14+
<section name="AdminImportValidationMessagesSection"/>
1415
</page>
1516
</pages>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@
1313
<element name="importBehavior" type="select" selector="#basic_behavior"/>
1414
<element name="selectFileToImport" type="input" selector="#import_file"/>
1515
<element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
16+
<element name="validationStrategy" type="select" selector="#basic_behaviorvalidation_strategy"/>
17+
<element name="allowedErrorsCount" type="input" selector="#basic_behavior_allowed_error_count"/>
1618
</section>
1719
</sections>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AdminImportValidationMessagesSection">
12+
<element name="notice" type="text" selector="#import_validation_messages .message-notice"/>
13+
<element name="success" type="text" selector="#import_validation_messages .message-success"/>
14+
<element name="messageByType" type="text" selector="#import_validation_messages .message-{{messageType}}" parameterized="true" />
15+
<element name="importErrorList" type="text" selector="#import_validation_messages .import-error-list"/>
16+
</section>
17+
</sections>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
<actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsFirstTime">
6161
<argument name="behavior" value="Add/Update"/>
6262
<argument name="importFile" value="prepared-for-sample-data.csv"/>
63-
<argument name="importMessage" value="Created: 100, Updated: 3, Deleted: 0"/>
63+
<argument name="importNoticeMessage" value="Created: 100, Updated: 3, Deleted: 0"/>
6464
</actionGroup>
6565

6666
<!-- Import products with add/update behavior again -->
6767
<actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProductsSecondTime">
6868
<argument name="behavior" value="Add/Update"/>
6969
<argument name="importFile" value="prepared-for-sample-data.csv"/>
70-
<argument name="importMessage" value="Created: 0, Updated: 300, Deleted: 0"/>
70+
<argument name="importNoticeMessage" value="Created: 0, Updated: 300, Deleted: 0"/>
7171
</actionGroup>
7272
</test>
7373
</tests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
7373
<argument name="behavior" value="Add/Update"/>
7474
<argument name="importFile" value="catalog_import_products.csv"/>
75-
<argument name="importMessage" value="Created: 2, Updated: 1, Deleted: 0"/>
75+
<argument name="importNoticeMessage" value="Created: 2, Updated: 1, Deleted: 0"/>
7676
</actionGroup>
7777

7878
<!-- Assert Simple Product1 on grid-->
@@ -109,7 +109,7 @@
109109
<actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct1Validation">
110110
<argument name="product" value="SimpleProductAfterImport1"/>
111111
</actionGroup>
112-
112+
113113
<!-- Assert SimpleProduct2 on store front-->
114114
<actionGroup ref="StoreFrontProductValidationActionGroup" stepKey="storeFrontSimpleProduct2Validation">
115115
<argument name="product" value="SimpleProductAfterImport2"/>

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="AdminImportProductsWithErrorEntriesTest">
10+
<annotations>
11+
<features value="ImportExport"/>
12+
<stories value="Import Products"/>
13+
<title value="Import products with error entries"/>
14+
<description value="Verify import status during import products with error entries"/>
15+
<severity value="MAJOR"/>
16+
<testCaseId value="MC-6358"/>
17+
<useCaseId value="MAGETWO-65066"/>
18+
<group value="importExport"/>
19+
</annotations>
20+
<before>
21+
<!--Login to Admin Page-->
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<!--Clear products grid filters-->
26+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
27+
<!--Delete all imported products-->
28+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
29+
<!--Logout from Admin page-->
30+
<actionGroup ref="logout" stepKey="logoutFromAdminPage"/>
31+
</after>
32+
33+
<!--Import products with "Skip error entries"-->
34+
<actionGroup ref="AdminImportProductsWithCheckValidationResultActionGroup" stepKey="importProductsWithSkipErrorEntries">
35+
<argument name="behavior" value="Add/Update"/>
36+
<argument name="validationStrategy" value="Skip error entries"/>
37+
<argument name="importFile" value="catalog_product_err_img.csv"/>
38+
<argument name="importNoticeMessage" value="Created: 10, Updated: 0, Deleted: 0"/>
39+
<argument name="validationNoticeMessage" value="Checked rows: 10, checked entities: 10, invalid rows: 0, total errors: 0"/>
40+
</actionGroup>
41+
<see selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10" stepKey="seeTenImportError"/>
42+
43+
<!--Import products with "Stop on Error" and "Allowed Errors Count" equals 5-->
44+
<actionGroup ref="AdminImportProductsWithCheckValidationResultActionGroup" stepKey="importProductsWithAllowedErrorsCountFive">
45+
<argument name="behavior" value="Add/Update"/>
46+
<argument name="allowedErrorsCount" value="5"/>
47+
<argument name="importFile" value="catalog_product_err_img.csv"/>
48+
<argument name="importNoticeMessage" value="Following Error(s) has been occurred during importing process"/>
49+
<argument name="importMessageType" value="error"/>
50+
<argument name="importMessage" value="Maximum error count has been reached or system error is occurred!"/>
51+
<argument name="validationNoticeMessage" value="Checked rows: 10, checked entities: 10, invalid rows: 0, total errors: 0"/>
52+
</actionGroup>
53+
<see selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 1, 2, 3, 4, 5, 6" stepKey="seeAboutFiveImportError"/>
54+
55+
<!--Import products with "Stop on Error" and "Allowed Errors Count" equals 11-->
56+
<actionGroup ref="AdminImportProductsWithCheckValidationResultActionGroup" stepKey="importProductsWithAllowedErrorsCountEleven">
57+
<argument name="behavior" value="Add/Update"/>
58+
<argument name="allowedErrorsCount" value="11"/>
59+
<argument name="importFile" value="catalog_product_err_img.csv"/>
60+
<argument name="importNoticeMessage" value="Created: 0, Updated: 10, Deleted: 0"/>
61+
<argument name="validationNoticeMessage" value="Checked rows: 10, checked entities: 10, invalid rows: 0, total errors: 0"/>
62+
</actionGroup>
63+
<see selector="{{AdminImportValidationMessagesSection.importErrorList}}" userInput="row(s): 1, 2, 3, 4, 5, 6, 7, 8, 9, 10" stepKey="seeAboutTenImportError"/>
64+
</test>
65+
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<actionGroup ref="AdminImportProductsActionGroup" stepKey="adminImportProducts">
4040
<argument name="behavior" value="Replace"/>
4141
<argument name="importFile" value="catalog_import_products.csv"/>
42-
<argument name="importMessage" value="Created: 3, Updated: 0, Deleted: 3"/>
42+
<argument name="importNoticeMessage" value="Created: 3, Updated: 0, Deleted: 3"/>
4343
</actionGroup>
4444
</test>
4545
</tests>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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,additional_images
2+
simple1,,Default,simple,,base,simple1,,,,1,Taxable Goods,"Catalog, Search",100,,,,simple1,test.jpg
3+
simple2,,Default,simple,,base,simple2,,,,2,Taxable Goods,"Catalog, Search",101,,,,simple2,test.jpg
4+
simple3,,Default,simple,,base,simple3,,,,3,Taxable Goods,"Catalog, Search",102,,,,simple3,test.jpg
5+
simple4,,Default,simple,,base,simple4,,,,4,Taxable Goods,"Catalog, Search",103,,,,simple4,test.jpg
6+
simple5,,Default,simple,,base,simple5,,,,5,Taxable Goods,"Catalog, Search",104,,,,simple5,test.jpg
7+
simple6,,Default,simple,,base,simple6,,,,6,Taxable Goods,"Catalog, Search",105,,,,simple6,test.jpg
8+
simple7,,Default,simple,,base,simple7,,,,7,Taxable Goods,"Catalog, Search",106,,,,simple7,test.jpg
9+
simple8,,Default,simple,,base,simple8,,,,8,Taxable Goods,"Catalog, Search",107,,,,simple8,test.jpg
10+
simple9,,Default,simple,,base,simple9,,,,9,Taxable Goods,"Catalog, Search",108,,,,simple9,test.jpg
11+
simple10,,Default,simple,,base,simple10,,,,10,Taxable Goods,"Catalog, Search",109,,,,simple10,test.jpg

0 commit comments

Comments
 (0)