MAGETWO-88432: Filesystem Directory Improvement

Author: Oleksandr Gorkun

app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Delete.php

@@ -53,9 +53,13 @@ public function execute()
                 $sitemap->load($id);
                 // delete file
                 $sitemapPath = $sitemap->getSitemapPath();
+                if ($sitemapPath && $sitemapPath[0] === DIRECTORY_SEPARATOR) {
+                    $sitemapPath = mb_substr($sitemapPath, 1);
+                }
                 $sitemapFilename = $sitemap->getSitemapFilename();
-
-                $path = $directory->getRelativePath($sitemapPath . $sitemapFilename);
+                $path = $directory->getRelativePath(
+                    $sitemapPath .$sitemapFilename
+                );
                 if ($sitemap->getSitemapFilename() && $directory->isFile($path)) {
                     $directory->delete($path);
                 }

app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php

@@ -101,11 +101,7 @@ public function testExecuteWithWrongFileName()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 
-        $this->assertTrue(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $fileName)
-            )
-        );
+        $this->assertFileExists($this->fullDirectoryPath . $fileName);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFilesTest.php

@@ -112,11 +112,7 @@ public function testExecuteWithWrongDirectoryName()
         $this->model->getRequest()->setParams(['node' => $this->imagesHelper->idEncode($directoryName)]);
         $this->model->execute();
 
-        $this->assertTrue(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $directoryName)
-            )
-        );
+        $this->assertFileExists($this->fullDirectoryPath . $directoryName);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolderTest.php

@@ -111,10 +111,8 @@ public function testExecuteWithWrongPath()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath . $dirPath);
         $this->model->execute();
 
-        $this->assertFalse(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $dirPath . $this->dirName)
-            )
+        $this->assertFileNotExists(
+            $this->fullDirectoryPath . $dirPath . $this->dirName
         );
     }
 

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolderTest.php

@@ -125,10 +125,8 @@ public function testExecuteWithWrongPath()
         $this->model->getStorage()->getSession()->setCurrentPath($dirPath);
         $this->model->execute();
 
-        $this->assertFalse(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $dirPath . $this->fileName)
-            )
+        $this->assertFileNotExists(
+            $this->fullDirectoryPath . $dirPath . $this->fileName
         );
     }
 
@@ -147,11 +145,7 @@ public function testExecuteWithWrongFileName()
         $this->model->getStorage()->getSession()->setCurrentPath($this->fullDirectoryPath);
         $this->model->execute();
 
-        $this->assertFalse(
-            $this->mediaDirectory->isExist(
-                $this->mediaDirectory->getRelativePath($this->fullDirectoryPath . $newFilename)
-            )
-        );
+        $this->assertFileNotExists($this->fullDirectoryPath . $newFilename);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/UploadTest.php

@@ -52,7 +52,7 @@ public function testValidatePath($path, $directoryConfig, $expectation)
     {
         $directory = $this->filesystem
             ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-        $path = $directory->getAbsolutePath($path);
+        $path = $directory->getAbsolutePath() .'/' .$path;
         $this->assertEquals($expectation, $this->directoryResolver->validatePath($path, $directoryConfig));
     }