Merge pull request #333 from matslindh/fix-windows-temp-path-filesyst…

…ems-test Fix usage of hard coded temp directory in FileSystem-based tests.
imbo · May 28, 2015 · 1828d75 · 1828d75
2 parents bd92a7a + c128a0d
commit 1828d75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tests/phpunit/ImboIntegrationTest/EventListener/ImageVariations/Storage/FilesystemTest.php b/tests/phpunit/ImboIntegrationTest/EventListener/ImageVariations/Storage/FilesystemTest.php
@@ -22,7 +22,7 @@ class FilesystemTest extends StorageTests {
     /**
      * @var string
      */
-    private $path = '/tmp/imboVariationsFilesystemIntegrationTest';
+    private $path = null;
 
     /**
      * @see ImboIntegrationTest\Storage\StorageTests::getAdapter()
@@ -37,6 +37,8 @@ protected function getAdapter() {
      * Set up the directory for each test, ensuring it's empty
      */
     public function setUp() {
+        $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'imboVariationsFilesystemIntegrationTest';
+
         if (is_dir($this->path)) {
             $this->rmdir($this->path);
         }

diff --git a/tests/phpunit/ImboIntegrationTest/Storage/FilesystemTest.php b/tests/phpunit/ImboIntegrationTest/Storage/FilesystemTest.php
@@ -21,7 +21,7 @@ class FilesystemTest extends StorageTests {
     /**
      * @var string
      */
-    private $path = '/tmp/imboFilesystemIntegrationTest';
+    private $path = null;
 
     /**
      * @see ImboIntegrationTest\Storage\StorageTests::getDriver()
@@ -33,6 +33,8 @@ protected function getDriver() {
     }
 
     public function setUp() {
+        $this->path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'imboFilesystemIntegrationTest';
+
         if (is_dir($this->path)) {
             $this->rmdir($this->path);
         }