Merge commit 'refs/pull/12/head' of https://github.com/magento/magento2ce into epam-4

Author: Andrey Konosov

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

@@ -678,10 +678,10 @@ public function isRowAllowedToImport(array $rowData, $rowNumber)
     }
 
     /**
-    * Is import need to log in history.
-    *
-    * @return bool
-    */
+     * Is import need to log in history.
+     *
+     * @return bool
+     */
     public function isNeedToLogInHistory()
     {
         return $this->logInHistory;

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -98,6 +98,16 @@ class ImportTest extends \PHPUnit_Framework_TestCase
      */
     protected $_varDirectory;
 
+    /**
+     * @var \Magento\Framework\Filesystem\DriverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_driver;
+
+    /**
+     * Set up
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function setUp()
     {
         $logger = $this->getMockBuilder('\Psr\Log\LoggerInterface')
@@ -155,6 +165,17 @@ public function setUp()
         $this->_varDirectory = $this->getMockBuilder('\Magento\Framework\Filesystem\Directory\WriteInterface')
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->_driver = $this->getMockBuilder('\Magento\Framework\Filesystem\DriverInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->_driver
+            ->expects($this->any())
+            ->method('fileGetContents')
+            ->willReturn('');
+        $this->_varDirectory
+            ->expects($this->any())
+            ->method('getDriver')
+            ->willReturn($this->_driver);
         $this->import = $this->getMockBuilder('\Magento\ImportExport\Model\Import')
             ->setConstructorArgs([
                 $logger,
@@ -538,7 +559,6 @@ public function testCreateHistoryReportSourceFileRelativeIsArray()
         $fileName = $sourceFileRelative['file_name'];
         $gmtTimestamp = 1234567;
         $copyName = $gmtTimestamp . '_' . $fileName;
-        $copyFile = \Magento\ImportExport\Model\Import::IMPORT_HISTORY_DIR . $copyName;
 
         $this->import
             ->expects($this->once())
@@ -550,13 +570,6 @@ public function testCreateHistoryReportSourceFileRelativeIsArray()
             ->method('getRelativePath')
             ->with(\Magento\ImportExport\Model\Import::IMPORT_DIR . $fileName)
             ->willReturn($sourceFileRelativeNew);
-        $this->_varDirectory
-            ->expects($this->once())
-            ->method('copyFile')
-            ->with(
-                $sourceFileRelativeNew,
-                $copyFile
-            );
         $this->dateTime
             ->expects($this->once())
             ->method('gmtTimestamp')
@@ -590,7 +603,6 @@ public function testCreateHistoryReportSourceFileRelativeIsNotArrayResultIsSet()
         $fileName = $result['name'];
         $gmtTimestamp = 1234567;
         $copyName = $gmtTimestamp . '_' . $fileName;
-        $copyFile = \Magento\ImportExport\Model\Import::IMPORT_HISTORY_DIR . $copyName;
 
         $this->import
             ->expects($this->once())
@@ -600,13 +612,6 @@ public function testCreateHistoryReportSourceFileRelativeIsNotArrayResultIsSet()
         $this->_varDirectory
             ->expects($this->never())
             ->method('getRelativePath');
-        $this->_varDirectory
-            ->expects($this->once())
-            ->method('copyFile')
-            ->with(
-                $sourceFileRelative,
-                $copyFile
-            );
         $this->dateTime
             ->expects($this->once())
             ->method('gmtTimestamp')
@@ -638,7 +643,6 @@ public function testCreateHistoryReportExtensionIsSet()
         $fileName = $entity . $extension;
         $gmtTimestamp = 1234567;
         $copyName = $gmtTimestamp . '_' . $fileName;
-        $copyFile = \Magento\ImportExport\Model\Import::IMPORT_HISTORY_DIR . $copyName;
 
         $this->import
             ->expects($this->once())
@@ -648,13 +652,6 @@ public function testCreateHistoryReportExtensionIsSet()
         $this->_varDirectory
             ->expects($this->never())
             ->method('getRelativePath');
-        $this->_varDirectory
-            ->expects($this->once())
-            ->method('copyFile')
-            ->with(
-                $sourceFileRelative,
-                $copyFile
-            );
         $this->dateTime
             ->expects($this->once())
             ->method('gmtTimestamp')
@@ -697,20 +694,16 @@ public function testCreateHistoryReportThrowException()
             ->expects($this->never())
             ->method('getRelativePath');
         $phrase = $this->getMock('\Magento\Framework\Phrase', [], [], '', false);
-        $this->_varDirectory
-            ->expects($this->once())
-            ->method('copyFile')
+        $this->_driver
+            ->expects($this->any())
+            ->method('fileGetContents')
             ->willReturnCallback(function () use ($phrase) {
                 throw new \Magento\Framework\Exception\FileSystemException($phrase);
             });
         $this->dateTime
             ->expects($this->once())
             ->method('gmtTimestamp')
             ->willReturn($gmtTimestamp);
-        $this->historyModel
-            ->expects($this->never())
-            ->method('addReport');
-
         $args = [
             $sourceFileRelative,
             $entity,