Merge branch 'MAGNIMEX-120-integration-tests-changes' into 'master'

Magnimex 120 integration tests changes

See merge request !164

Author: A-Komar

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

@@ -1324,10 +1324,14 @@ protected function _saveProducts()
                     }
                 }
 
+                $this->websitesCache[$rowSku] = [];
                 // 2. Product-to-Website phase
                 if (!empty($rowData[self::COL_PRODUCT_WEBSITES])) {
-                    $websiteId = $this->storeResolver->getWebsiteCodeToId($rowData[self::COL_PRODUCT_WEBSITES]);
-                    $this->websitesCache[$rowSku][$websiteId] = true;
+                    $websiteIds = explode($this->getMultipleValueSeparator(), $rowData[self::COL_PRODUCT_WEBSITES]);
+                    foreach ($websiteIds as $websiteId) {
+                        $websiteId = $this->storeResolver->getWebsiteCodeToId($rowData[self::COL_PRODUCT_WEBSITES]);
+                        $this->websitesCache[$rowSku][$websiteId] = true;
+                    }
                 }
 
                 // 3. Categories phase

app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php

@@ -183,7 +183,9 @@ protected function _populateForUrlGeneration($rowData)
                 $this->websitesToStoreIds[$websiteId] = $this->storeManager->getWebsite($websiteId)->getStoreIds();
             }
         }
-        if ($storeId = $this->import->getStoreIdByCode($rowData[ImportProduct::COL_STORE])) {
+        if (!empty($rowData[ImportProduct::COL_STORE])
+            && ($storeId = $this->import->getStoreIdByCode($rowData[ImportProduct::COL_STORE]))
+        ) {
             $product->setStoreId($storeId);
         }
         if ($this->isGlobalScope($product->getStoreId())) {

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractTest.php

@@ -25,6 +25,7 @@ protected function setUp()
             [
                 $objectManager->get('Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory'),
                 $objectManager->get('Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory'),
+                $objectManager->get('Magento\Framework\App\Resource'),
                 $params
             ]
         );