[FrameworkBundle] Small changes to test setup.

Drak · Drak · commit ff0412a2bd49 · 2011-12-16T20:45:29.000+05:45
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php
@@ -18,7 +18,7 @@ class WebTestCase extends BaseWebTestCase
 {
     static public function assertRedirect($response, $location)
     {
-        self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.substr($response, 0, 2000));
+        self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.$response->getStatusCode());
         self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php
@@ -17,12 +17,12 @@
 while ($dir !== $lastDir) {
     $lastDir = $dir;
 
-    if (is_file($dir.'/autoload.php')) {
+    if (file_exists($dir.'/autoload.php')) {
         require_once $dir.'/autoload.php';
         break;
     }
 
-    if (is_file($dir.'/autoload.php.dist')) {
+    if (file_exists($dir.'/autoload.php.dist')) {
         require_once $dir.'/autoload.php.dist';
         break;
     }
@@ -52,7 +52,7 @@ public function __construct($testCase, $rootConfig, $environment, $debug)
         $this->testCase = $testCase;
 
         $fs = new Filesystem();
-        if (!$fs->isAbsolutePath($rootConfig) && !is_file($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {
+        if (!$fs->isAbsolutePath($rootConfig) && !file_exists($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {
             throw new \InvalidArgumentException(sprintf('The root config "%s" does not exist.', $rootConfig));
         }
         $this->rootConfig = $rootConfig;
@@ -62,7 +62,7 @@ public function __construct($testCase, $rootConfig, $environment, $debug)
 
     public function registerBundles()
     {
-        if (!is_file($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {
+        if (!file_exists($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {
             throw new \RuntimeException(sprintf('The bundles file "%s" does not exist.', $filename));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/config/framework.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/config/framework.yml
@@ -8,7 +8,9 @@ framework:
     form: ~
     test: ~
     session:
+        default_locale: en
         auto_start:     true
         storage_id:     session.storage.filesystem
+
 services:
     logger: { class: Symfony\Component\HttpKernel\Log\NullLogger }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class WebTestCase extends BaseWebTestCase`
`18`	`18`	`{`
`19`	`19`	`static public function assertRedirect($response, $location)`
`20`	`20`	`{`
`21`		`- self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.substr($response, 0, 2000));`
	`21`	`+ self::assertTrue($response->isRedirect(), 'Response is not a redirect, got status code: '.$response->getStatusCode());`
`22`	`22`	`self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@`
`17`	`17`	`while ($dir !== $lastDir) {`
`18`	`18`	`$lastDir = $dir;`
`19`	`19`
`20`		`- if (is_file($dir.'/autoload.php')) {`
	`20`	`+ if (file_exists($dir.'/autoload.php')) {`
`21`	`21`	`require_once $dir.'/autoload.php';`
`22`	`22`	`break;`
`23`	`23`	`}`
`24`	`24`
`25`		`- if (is_file($dir.'/autoload.php.dist')) {`
	`25`	`+ if (file_exists($dir.'/autoload.php.dist')) {`
`26`	`26`	`require_once $dir.'/autoload.php.dist';`
`27`	`27`	`break;`
`28`	`28`	`}`
`@@ -52,7 +52,7 @@ public function __construct($testCase, $rootConfig, $environment, $debug)`
`52`	`52`	`$this->testCase = $testCase;`
`53`	`53`
`54`	`54`	`$fs = new Filesystem(); D85C`
`55`		`- if (!$fs->isAbsolutePath($rootConfig) && !is_file($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {`
	`55`	`+ if (!$fs->isAbsolutePath($rootConfig) && !file_exists($rootConfig = __DIR__.'/'.$testCase.'/'.$rootConfig)) {`
`56`	`56`	`throw new \InvalidArgumentException(sprintf('The root config "%s" does not exist.', $rootConfig));`
`57`	`57`	`}`
`58`	`58`	`$this->rootConfig = $rootConfig;`
`@@ -62,7 +62,7 @@ public function __construct($testCase, $rootConfig, $environment, $debug)`
`62`	`62`
`63`	`63`	`public function registerBundles()`
`64`	`64`	`{`
`65`		`- if (!is_file($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {`
	`65`	`+ if (!file_exists($filename = $this->getRootDir().'/'.$this->testCase.'/bundles.php')) {`
`66`	`66`	`throw new \RuntimeException(sprintf('The bundles file "%s" does not exist.', $filename));`
`67`	`67`	`}`
`68`	`68`