Merge remote-tracking branch 'origin/MAGETWO-52037' into develop

Author: Alex Bomko

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

@@ -1270,7 +1270,7 @@ protected function _saveProductCategories(array $categoriesData)
                 );
             }
             if ($categoriesIn) {
-                $this->_connection->insertOnDuplicate($tableName, $categoriesIn, ['position']);
+                $this->_connection->insertOnDuplicate($tableName, $categoriesIn, ['product_id', 'category_id']);
             }
         }
         return $this;

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -14,6 +14,8 @@
  */
 namespace Magento\CatalogImportExport\Model\Import;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
@@ -887,6 +889,70 @@ public function testProductCategories($fixture, $separator)
         $this->assertTrue(count($categories) == 2);
     }
 
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testProductPositionInCategory()
+    {
+        /* @var \Magento\Catalog\Model\ResourceModel\Category\Collection $collection */
+        $collection = $this->objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+        $collection->addNameToResult()->load();
+        /** @var Category $category */
+        $category = $collection->getItemByColumnValue('name', 'Category 1');
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+
+        $categoryProducts = [];
+        $i = 51;
+        foreach (['simple1', 'simple2', 'simple3'] as $sku) {
+            $categoryProducts[$productRepository->get($sku)->getId()] = $i++;
+        }
+        $category->setPostedProducts($categoryProducts);
+        $category->save();
+
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Filesystem::class
+        );
+
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import.csv',
+                'directory' => $directory
+            ]
+        );
+        $errors = $this->_model->setSource(
+            $source
+        )->setParameters(
+            [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                'entity' => 'catalog_product'
+            ]
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+        $this->_model->importData();
+
+        /** @var \Magento\Framework\App\ResourceConnection $resourceConnection */
+        $resourceConnection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\App\ResourceConnection::class
+        );
+        $tableName = $resourceConnection->getTableName('catalog_category_product');
+        $select = $resourceConnection->getConnection()->select()->from($tableName)
+            ->where('category_id = ?', $category->getId());
+        $items = $resourceConnection->getConnection()->fetchAll($select);
+        $this->assertCount(3, $items);
+        foreach ($items as $item) {
+            $this->assertGreaterThan(50, $item['position']);
+        }
+    }
+
     /**
      * @return array
      */

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import.csv

@@ -1,4 +1,4 @@
-sku,product_type,store_view_code,name,price,attribute_set_code
-simple1,simple,,"simple 1",25,Default
-simple2,simple,,"simple 2",34,Default
-simple3,simple,,"simple 3",58,Default
+sku,product_type,store_view_code,name,price,attribute_set_code,categories
+simple1,simple,,"simple 1",25,Default,"Default Category/Category 1"
+simple2,simple,,"simple 2",34,Default,"Default Category/Category 1"
+simple3,simple,,"simple 3",58,Default,"Default Category/Category 1"