diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 23:04:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 23:04:33 +0200 |
| commit | 56f881953db33f5aa9362de77ab635979b1e4b3b (patch) | |
| tree | accb17f957ad42a627ee2592021e25c9a04ee106 /tests/controller/controller_test.php | |
| parent | dbb7552614dfb8af7bd8ac74988c52f06301a9f7 (diff) | |
| parent | ed089f4b5fa072c9298bd1a2bffae97da4a2616c (diff) | |
| download | forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar.gz forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar.bz2 forums-56f881953db33f5aa9362de77ab635979b1e4b3b.tar.xz forums-56f881953db33f5aa9362de77ab635979b1e4b3b.zip | |
Merge pull request #2388 from nickvergessen/ticket/12480
[ticket/12480] Only load config/routing.yml from extensions route
* nickvergessen/ticket/12480:
[ticket/12480] Remove unused use statements
[ticket/12480] Add subfolder/config/routing.yml which should not be found
[ticket/12480] Only load config/routing.yml from extensions route
Diffstat (limited to 'tests/controller/controller_test.php')
| -rw-r--r-- | tests/controller/controller_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 550679ff07..7d9fe652eb 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -8,8 +8,6 @@ */ use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Routing\Route; -use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; @@ -43,6 +41,8 @@ class phpbb_controller_controller_test extends phpbb_test_case $this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('controller2')); $this->assertEquals('/foo/bar', $routes->get('controller2')->getPath()); + + $this->assertNull($routes->get('controller_noroute')); } public function test_controller_resolver() |