Merge branch '2.7' into 2.8
* 2.7: [Routing] remove useless failing mocks
This commit is contained in:
commit
64e538e730
@ -102,7 +102,7 @@ class RouterTest extends TestCase
|
||||
|
||||
$this->loader->expects($this->once())
|
||||
->method('load')->with('routing.yml', null)
|
||||
->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
|
||||
->will($this->returnValue(new RouteCollection()));
|
||||
|
||||
$this->assertInstanceOf('Symfony\\Component\\Routing\\Matcher\\UrlMatcher', $this->router->getMatcher());
|
||||
}
|
||||
@ -124,7 +124,7 @@ class RouterTest extends TestCase
|
||||
|
||||
$this->loader->expects($this->once())
|
||||
->method('load')->with('routing.yml', null)
|
||||
->will($this->returnValue($this->getMockBuilder('Symfony\Component\Routing\RouteCollection')->getMock()));
|
||||
->will($this->returnValue(new RouteCollection()));
|
||||
|
||||
$this->assertInstanceOf('Symfony\\Component\\Routing\\Generator\\UrlGenerator', $this->router->getGenerator());
|
||||
}
|
||||
|
Reference in New Issue
Block a user