Merge pull request #151 from symfony-cmf/do-normal-test

the twig regression is fixed, run the standard test again. fix #141

Author: lsmith77

Tests/Functional/Admin/RouteAdminTest.php

@@ -79,9 +79,7 @@ public function testTemplateViolation()
 
     public function testCorrectTemplate()
     {
-        // the template 'TwigBundle::layout.html.twig' is not found in the test setup...
-        $mockTemplate = $this->getMockBuilder('Twig_Template')->disableOriginalConstructor()->getMockForAbstractClass();
-        $route = new Route('/', array('_template' => $mockTemplate));
+        $route = new Route('/', array('_template' => 'TwigBundle::layout.html.twig'));
         $this->errorElement->expects($this->never())
             ->method('with')
         ;

Tests/Functional/Routing/DynamicRouterTest.php

@@ -260,6 +260,7 @@ public function testEnhanceTemplateByClass()
         }
         $document = new Content();
         $document->setId('/test/templatebyclass');
+        $document->setTitle('the title');
         $this->getDm()->persist($document);
 
         // put a route for this content