merged branch bdmu/ticket_5341 (PR #5342)

fabpot · fabpot · commit 71f3081188c9 · 2012-08-26T11:07:01.000+02:00
Commits ------- 9beffff [HttpKernel] KernelTest::testGetRootDir fails on Windows for branch 2.0 Discussion ---------- [HttpKernel] fix KernelTest::testGetRootDir fails on Windows for branch 2.0 Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #5341 Todo: - License of the code: MIT Documentation PR: replace $this->assertEquals(DIR, $kernel->getRootDir()); with $this->assertEquals(DIR, realpath($kernel->getRootDir())); line 287 --------------------------------------------------------------------------- by pborreli at 2012-08-25T20:23:34Z :+1:
diff --git a/tests/Symfony/Tests/Component/HttpKernel/KernelTest.php b/tests/Symfony/Tests/Component/HttpKernel/KernelTest.php
@@ -284,7 +284,7 @@ public function testGetRootDir()
     {
         $kernel = new KernelForTest('test', true);
 
-        $this->assertEquals(__DIR__, $kernel->getRootDir());
+        $this->assertEquals(__DIR__, realpath($kernel->getRootDir()));
     }
 
     public function testGetName()

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ public function testGetRootDir()`
`284`	`284`	`{`
`285`	`285`	`$kernel = new KernelForTest('test', true);`
`286`	`286`
`287`		`- $this->assertEquals(__DIR__, $kernel->getRootDir());`
	`287`	`+ $this->assertEquals(__DIR__, realpath($kernel->getRootDir()));`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`public function testGetName()`