Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2013
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Tests/Functional/Admin/RouteAdminTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
;
Expand Down
1 change: 1 addition & 0 deletions Tests/Functional/Routing/DynamicRouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down