Merge remote-tracking branch 'remotes/github/MAGETWO-70803' into EPAM-PR-73

Author: VeronikaYarats

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -141,7 +141,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     const COL_PRODUCT_WEBSITES = '_product_websites';
 
     /**
-     * Media gallery attribute code.
+     * Attribute code for media gallery.
      */
     const MEDIA_GALLERY_ATTRIBUTE_CODE = 'media_gallery';
 
@@ -151,12 +151,12 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     const COL_MEDIA_IMAGE = '_media_image';
 
     /**
-     * Inventory use config.
+     * Inventory use config label.
      */
     const INVENTORY_USE_CONFIG = 'Use Config';
 
     /**
-     * Inventory use config prefix.
+     * Prefix for inventory use config.
      */
     const INVENTORY_USE_CONFIG_PREFIX = 'use_config_';
 
@@ -1886,6 +1886,7 @@ protected function _saveProducts()
 
         return $this;
     }
+    //phpcs:enable Generic.Metrics.NestingLevel
 
     /**
      * Prepare array with image states (visible or hidden from product page)
@@ -2736,8 +2737,6 @@ protected function _saveValidatedBunches()
             try {
                 $rowData = $source->current();
             } catch (\InvalidArgumentException $e) {
-                $this->addRowError($e->getMessage(), $this->_processedRowsCount);
-                $this->_processedRowsCount++;
                 $source->next();
                 continue;
             }

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

@@ -46,4 +46,11 @@
         <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="{{validationNoticeMessage}}" after="waitForValidationNoticeMessage" stepKey="seeValidationNoticeMessage"/>
         <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="{{validationMessage}}" after="seeValidationNoticeMessage" stepKey="seeValidationMessage"/>
     </actionGroup>
+    <actionGroup name="checkDataForImportProductActionGroup" extends="AdminImportProductsActionGroup">
+        <remove keyForRemoval="clickImportButton"/>
+        <remove keyForRemoval="AdminImportMainSectionLoad2"/>
+        <remove keyForRemoval="assertSuccessMessage"/>
+        <remove keyForRemoval="AdminMessagesSection"/>
+        <remove keyForRemoval="seeImportMessage"/>
+    </actionGroup>
 </actionGroups>

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

@@ -13,6 +13,8 @@
         <element name="importBehavior" type="select" selector="#basic_behavior"/>
         <element name="selectFileToImport" type="input" selector="#import_file"/>
         <element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
+        <element name="messageSuccess" type="text" selector=".messages div.message-success"/>
+        <element name="messageError" type="text" selector=".messages div.message-error"/>
         <element name="validationStrategy" type="select" selector="#basic_behaviorvalidation_strategy"/>
         <element name="allowedErrorsCount" type="input" selector="#basic_behavior_allowed_error_count"/>
     </section>

app/code/Magento/ImportExport/Test/Mftf/Test/AdminProductImportCSVFileCorrectDifferentFilesTest.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminProductImportCSVFileCorrectDifferentFilesTest">
+        <annotations>
+            <description value="Product import from CSV file correct from different files."/>
+            <features value="Import/Export"/>
+            <title value="Product import from CSV file correct from different files."/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-17104"/>
+            <useCaseId value="MAGETWO-70803"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <!--Login as Admin-->
+            <comment userInput="Login as Admin" stepKey="commentLogin"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Logout from Admin-->
+            <comment userInput="Logout from Admin" stepKey="commentLogout"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Check data products with add/update behavior-->
+        <comment userInput="Check data products with add/update behavior" stepKey="commentCheckData"/>
+        <actionGroup ref="checkDataForImportProductActionGroup" stepKey="adminImportProducts">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="BB-ProductsWorking.csv"/>
+            <argument name="importMessage" value="Checked rows: 28, checked entities: 28, invalid rows: 0, total errors: 0"/>
+        </actionGroup>
+        <see selector="{{AdminImportMainSection.messageSuccess}}" userInput='File is valid! To start import process press "Import" button' stepKey="seeSuccessMessage"/>
+        <actionGroup ref="checkDataForImportProductActionGroup" stepKey="adminImportProducts1">
+            <argument name="behavior" value="Add/Update"/>
+            <argument name="importFile" value="BB-Products.csv"/>
+            <argument name="importMessage" value="Checked rows: 117, checked entities: 115, invalid rows: 2, total errors: 2"/>
+            <argument name="checkMessage" value='Curly quotes used instead of straight quotes in row(s): 84, 85'/>
+        </actionGroup>
+        <see selector="{{AdminImportMainSection.messageError}}" userInput='Curly quotes used instead of straight quotes in row(s): 84, 85' stepKey="seeErrorMessage"/>
+    </test>
+</tests>