Merge pull request #182 from jaugustin/fix-tests-cross-platform

Fix tests cross platform
propelorm · Oct 21, 2012 · 15a5e74 · 15a5e74
2 parents ea7653d + 253a3ac
commit 15a5e74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Tests/Command/AbstractCommandTest.php b/Tests/Command/AbstractCommandTest.php
@@ -57,7 +57,8 @@ public function testTransformToLogicalName()
         $schema
             ->expects($this->once())
             ->method('getRealPath')
-            ->will($this->returnValue('/Users/foo/project/src/My/SuperBundle/Resources/config/my-schema.xml'));
+            ->will($this->returnValue('/Users/foo/project/src/My/SuperBundle'
+                    . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'my-schema.xml'));
 
         $expected = '@MySuperBundle/Resources/config/my-schema.xml';
 
@@ -83,7 +84,8 @@ public function testTransformToLogicalNameWithSubDir()
         $schema
             ->expects($this->once())
             ->method('getRealPath')
-            ->will($this->returnValue('/Users/foo/project/src/My/SuperBundle/Resources/config/propel/my-schema.xml'));
+            ->will($this->returnValue('/Users/foo/project/src/My/SuperBundle'
+                    . DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'propel/my-schema.xml'));
 
         $expected = '@MySuperBundle/Resources/config/propel/my-schema.xml';
 

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "propel/propel1": "1.6.*"
   },
   "require-dev": {
-    "sensio/framework-extra-bundle": "dev-master",
+    "sensio/framework-extra-bundle": ">=2.1",
     "fzaninotto/faker": "dev-master"
   },
   "autoload": {