[TwigBundle] Fixed tests

src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

@@ -59,15 +59,17 @@ class TwigExtensionTest extends TestCase
 
         // Globals
         $calls = $container->getDefinition('twig')->getMethodCalls();
-        $this->assertEquals('foo', $calls[0][1][0], '->load() registers services as Twig globals');
-        $this->assertEquals(new Reference('bar'), $calls[0][1][1], '->load() registers services as Twig globals');
-        $this->assertEquals('pi', $calls[1][1][0], '->load() registers variables as Twig globals');
-        $this->assertEquals(3.14, $calls[1][1][1], '->load() registers variables as Twig globals');
+        $this->assertEquals('app', $calls[0][1][0]);
+        $this->assertEquals(new Reference('templating.globals'), $calls[0][1][1]);
+        $this->assertEquals('foo', $calls[1][1][0], '->load() registers services as Twig globals');
+        $this->assertEquals(new Reference('bar'), $calls[1][1][1], '->load() registers services as Twig globals');
+        $this->assertEquals('pi', $calls[2][1][0], '->load() registers variables as Twig globals');
+        $this->assertEquals(3.14, $calls[2][1][1], '->load() registers variables as Twig globals');
 
         // Yaml and Php specific configs
         if (in_array($format, array('yml', 'php'))) {
-            $this->assertEquals('bad', $calls[2][1][0], '->load() registers variables as Twig globals');
-            $this->assertEquals(array('key' => 'foo'), $calls[2][1][1], '->load() registers variables as Twig globals');
+            $this->assertEquals('bad', $calls[3][1][0], '->load() registers variables as Twig globals');
+            $this->assertEquals(array('key' => 'foo'), $calls[3][1][1], '->load() registers variables as Twig globals');
         }
 
         // Twig options
@@ -101,7 +103,7 @@ class TwigExtensionTest extends TestCase
 
         $calls = $container->getDefinition('twig')->getMethodCalls();
 
-        foreach ($calls as $call) {
+        foreach (array_slice($calls, 1) as $call) {
             list($name, $value) = each($globals);
             $this->assertEquals($name, $call[1][0]);
             $this->assertSame($value, $call[1][1]);

src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php

@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\TwigBundle\Tests;
-
-use Symfony\Bundle\TwigBundle\TwigEngine;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session;
-use Symfony\Component\HttpFoundation\SessionStorage\ArraySessionStorage;
-use Symfony\Component\Templating\TemplateNameParser;
-use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
-
-class TwigEngineTest extends TestCase
-{
-    public function testEvaluateAddsAppGlobal()
-    {
-        $environment = $this->getTwigEnvironment();
-        $container = $this->getContainer();
-        $engine = new TwigEngine($environment, new TemplateNameParser(), $app = new GlobalVariables($container));
-
-        $template = $this->getMock('\Twig_TemplateInterface');
-
-        $environment->expects($this->once())
-            ->method('loadTemplate')
-            ->will($this->returnValue($template));
-
-        $engine->render('name');
-
-        $request = $container->get('request');
-        $globals = $environment->getGlobals();
-        $this->assertSame($app, $globals['app']);
-    }
-
-    public function testEvaluateWithoutAvailableRequest()
-    {
-        $environment = $this->getTwigEnvironment();
-        $container = new Container();
-        $engine = new TwigEngine($environment, new TemplateNameParser(), new GlobalVariables($container));
-
-        $template = $this->getMock('\Twig_TemplateInterface');
-
-        $environment->expects($this->once())
-            ->method('loadTemplate')
-            ->will($this->returnValue($template));
-
-        $container->set('request', null);
-
-        $engine->render('name');
-
-        $globals = $environment->getGlobals();
-        $this->assertEmpty($globals['app']->getRequest());
-    }
-
-    /**
-     * Creates a Container with a Session-containing Request service.
-     *
-     * @return Container
-     */
-    protected function getContainer()
-    {
-        $container = new Container();
-        $request = new Request();
-        $session = new Session(new ArraySessionStorage());
-
-        $request->setSession($session);
-        $container->set('request', $request);
-
-        return $container;
-    }
-
-    /**
-     * Creates a mock Twig_Environment object.
-     *
-     * @return \Twig_Environment
-     */
-    protected function getTwigEnvironment()
-    {
-        return $this
-            ->getMockBuilder('\Twig_Environment')
-            ->setMethods(array('loadTemplate'))
-            ->getMock();
-    }
-}