Merge pull request #179 from kevarch/tests/windows-support

fix broken tests on windows
liip · May 16, 2013 · 9d59494 · 9d59494
2 parents 7b2cd5c + 02fd524
commit 9d59494
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/Imagine/Cache/CacheManager.php b/Imagine/Cache/CacheManager.php
@@ -139,9 +139,15 @@ public function generateUrl($path, $filter, $absolute = false)
 
         if (isset($config['format'])) {
             $pathinfo = pathinfo($path);
+
             // the extension should be forced and a directory is detected
             if ((!isset($pathinfo['extension']) || $pathinfo['extension'] !== $config['format'])
                 && isset($pathinfo['dirname'])) {
+
+                if ('\\' === $pathinfo['dirname']) {
+                    $pathinfo['dirname'] = '';
+                }
+
                 $path = $pathinfo['dirname'].'/'.$pathinfo['filename'].'.'.$config['format'];
             }
         }

diff --git a/Imagine/Data/Loader/FileSystemLoader.php b/Imagine/Data/Loader/FileSystemLoader.php
@@ -61,9 +61,9 @@ public function find($path)
 
         $file = $this->rootPath.'/'.ltrim($path, '/');
         $info = $this->getFileInfo($file);
-        $absolutePath = $info['dirname'].'/'.$info['basename'];
+        $absolutePath = $info['dirname'].DIRECTORY_SEPARATOR.$info['basename'];
 
-        $name = $info['dirname'].'/'.$info['filename'];
+        $name = $info['dirname'].DIRECTORY_SEPARATOR.$info['filename'];
 
         $targetFormat = null;
         // set a format if an extension is found and is allowed

diff --git a/Tests/AbstractTest.php b/Tests/AbstractTest.php
@@ -19,7 +19,7 @@ protected function setUp()
     {
         $this->fixturesDir = __DIR__.'/Fixtures';
 
-        $this->tempDir = sys_get_temp_dir().'/liip_imagine_test';
+        $this->tempDir = str_replace('/', DIRECTORY_SEPARATOR, sys_get_temp_dir().'/liip_imagine_test');
 
         $this->filesystem = new Filesystem();
 

diff --git a/Tests/Imagine/Cache/CacheManagerTest.php b/Tests/Imagine/Cache/CacheManagerTest.php
@@ -17,7 +17,7 @@ class CacheManagerTest extends AbstractTest
     public function testGetWebRoot()
     {
         $cacheManager = new CacheManager($this->getMockFilterConfiguration(), $this->getMockRouter(), $this->fixturesDir.'/assets');
-        $this->assertEquals($this->fixturesDir.'/assets', $cacheManager->getWebRoot());
+        $this->assertEquals(str_replace('/', DIRECTORY_SEPARATOR, $this->fixturesDir.'/assets'), $cacheManager->getWebRoot());
     }
 
     public function testAddCacheManagerAwareResolver()

diff --git a/Tests/Imagine/Cache/Resolver/AbstractFilesystemResolverTest.php b/Tests/Imagine/Cache/Resolver/AbstractFilesystemResolverTest.php
@@ -13,8 +13,14 @@ class AbstractFilesystemResolverTest extends AbstractTest
 {
     public function testStoreCyrillicFilename()
     {
+        if (false !== strpos(strtolower(PHP_OS), 'win')) {
+            $this->markTestSkipped('file_get_contents can not read files with utf-8 file names on windows');
+        }
+
         $image = $this->fixturesDir.'/assets/АГГЗ.jpeg';
+
         $data = file_get_contents($image);
+
         $response = new Response($data, 200, array(
             'content-type' => 'image/jpeg',
         ));
@@ -30,6 +36,10 @@ public function testStoreCyrillicFilename()
 
     public function testStoreInvalidDirectory()
     {
+        if (false !== strpos(strtolower(PHP_OS), 'win')) {
+            $this->markTestSkipped('mkdir mode is ignored on windows');
+        }
+
         $resolver = $this->getMockAbstractFilesystemResolver(new Filesystem());
 
         $this->filesystem->mkdir($this->tempDir.'/unwriteable', 0555);

diff --git a/Tests/Imagine/Cache/Resolver/WebPathResolverTest.php b/Tests/Imagine/Cache/Resolver/WebPathResolverTest.php
@@ -62,7 +62,7 @@ public function testDefaultBehavior()
         $this->cacheManager
             ->expects($this->atLeastOnce())
             ->method('generateUrl')
-            ->will($this->returnValue('/media/cache/thumbnail/cats.jpeg'))
+            ->will($this->returnValue(str_replace('/', DIRECTORY_SEPARATOR, '/media/cache/thumbnail/cats.jpeg')))
         ;
 
         $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
@@ -75,7 +75,7 @@ public function testDefaultBehavior()
         // Resolve the requested image for the given filter.
         $targetPath = $this->resolver->resolve($request, 'cats.jpeg', 'thumbnail');
         // The realpath() is important for filesystems that are virtual in some way (encrypted, different mount options, ..)
-        $this->assertEquals(realpath($this->cacheDir).'/thumbnail/cats.jpeg', $targetPath,
+        $this->assertEquals(str_replace('/', DIRECTORY_SEPARATOR, realpath($this->cacheDir).'/thumbnail/cats.jpeg'), $targetPath,
             '->resolve() correctly converts the requested file into target path within webRoot.');
         $this->assertFalse(file_exists($targetPath),
             '->resolve() does not create the file within the target path.');
@@ -170,20 +170,20 @@ public function testResolveWithBasePath()
         $this->cacheManager
             ->expects($this->atLeastOnce())
             ->method('generateUrl')
-            ->will($this->returnValue('/sandbox/app_dev.php/media/cache/thumbnail/cats.jpeg'))
+            ->will($this->returnValue(str_replace('/', DIRECTORY_SEPARATOR, '/sandbox/app_dev.php/media/cache/thumbnail/cats.jpeg')))
         ;
 
         $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
         $request
             ->expects($this->atLeastOnce())
             ->method('getBaseUrl')
-            ->will($this->returnValue('/sandbox/app_dev.php'))
+            ->will($this->returnValue(str_replace('/', DIRECTORY_SEPARATOR, '/sandbox/app_dev.php')))
         ;
 
         // Resolve the requested image for the given filter.
         $targetPath = $this->resolver->resolve($request, 'cats.jpeg', 'thumbnail');
         // The realpath() is important for filesystems that are virtual in some way (encrypted, different mount options, ..)
-        $this->assertEquals(realpath($this->cacheDir).'/thumbnail/cats.jpeg', $targetPath,
+        $this->assertEquals(str_replace('/', DIRECTORY_SEPARATOR, realpath($this->cacheDir).'/thumbnail/cats.jpeg'), $targetPath,
             '->resolve() correctly converts the requested file into target path within webRoot.');
         $this->assertFalse(file_exists($targetPath),
             '->resolve() does not create the file within the target path.');