MAGETWO-88432: Filesystem Directory Improvement

Author: Oleksandr Gorkun

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

@@ -170,9 +170,15 @@ public function move($fileName, $renameFileOff = false)
                 }
             }
 
+            if ($this->getTmpDir()) {
+                $filePath = $this->getTmpDir() . '/';
+            } else {
+                $filePath = '';
+            }
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
+            $filePath = $this->_directory->getRelativePath($filePath . $fileName);
             $this->_directory->writeFile(
-                $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName),
+                $filePath,
                 $read->readAll()
             );
         }

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php

@@ -103,7 +103,7 @@ protected function setUp()
     public function testMoveFileUrl($fileUrl, $expectedHost, $expectedFileName)
     {
         $destDir = 'var/dest/dir';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $expectedFileName;
+        $expectedRelativeFilePath = $expectedFileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)
@@ -139,7 +139,7 @@ public function testMoveFileName()
     {
         $destDir = 'var/dest/dir';
         $fileName = 'test_uploader_file';
-        $expectedRelativeFilePath = $this->uploader->getTmpDir() . '/' . $fileName;
+        $expectedRelativeFilePath = $fileName;
         $this->directoryMock->expects($this->once())->method('isWritable')->with($destDir)->willReturn(true);
         $this->directoryMock->expects($this->any())->method('getRelativePath')->with($expectedRelativeFilePath);
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($destDir)