merged branch hason/tests_2_2 (PR #6202)

This PR was merged into the master branch.

Commits
-------

abe244f [TwigBundle] Fixed tests on windows

Discussion
----------

[TwigBundle] Fixed tests on windows
This commit is contained in:
Fabien Potencier 2012-12-11 09:58:49 +01:00
commit fe194cb03f

View File

@ -135,7 +135,7 @@ class TwigExtensionTest extends TestCase
array('namespaced_path1', 'namespace'),
array('namespaced_path2', 'namespace'),
array(__DIR__.'/Fixtures/Resources/TwigBundle/views', 'Twig'),
array(realpath(__DIR__.'/../../Resources/views'), 'Twig'),
array(realpath(__DIR__.'/../..').'/Resources/views', 'Twig'),
array(__DIR__.'/Fixtures/Resources/views'),
), $paths);
}