diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-22 00:29:20 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-22 00:29:20 -0700 |
| commit | a7e41b23fd7e7f39b1e37796eca618a59e0cb9be (patch) | |
| tree | f6f1ab691dce3e59204271a7e4c4463f406ac27d /tests | |
| parent | ba5b53521a186dc23d6d4b849c7f76196c783d43 (diff) | |
| parent | 96317b2c4518976c683dd67f38a8a6f8faabdf15 (diff) | |
| download | forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.gz forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.bz2 forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.tar.xz forums-a7e41b23fd7e7f39b1e37796eca618a59e0cb9be.zip | |
Merge pull request #1801 from nickvergessen/ticket/11948
Ticket/11948 Extensions should be allowed to have more then 1 routing file
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/controller/controller_test.php | 11 | ||||
| -rw-r--r-- | tests/controller/ext/foo/config/routing.yml | 4 | ||||
| -rw-r--r-- | tests/controller/ext/foo/config/routing_2.yml | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 10fced05a2..588adbcfb1 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -34,10 +34,17 @@ class phpbb_controller_controller_test extends phpbb_test_case $provider = new \phpbb\controller\provider; $routes = $provider ->import_paths_from_finder($this->extension_manager->get_finder()) - ->find('./tests/controller/'); + ->find(__DIR__); // This will need to be updated if any new routes are defined - $this->assertEquals(2, sizeof($routes)); + $this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('core_controller')); + $this->assertEquals('/core_foo', $routes->get('core_controller')->getPath()); + + $this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('controller1')); + $this->assertEquals('/foo', $routes->get('controller1')->getPath()); + + $this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('controller2')); + $this->assertEquals('/foo/bar', $routes->get('controller2')->getPath()); } public function test_controller_resolver() diff --git a/tests/controller/ext/foo/config/routing.yml b/tests/controller/ext/foo/config/routing.yml index 4799fec37d..6cc275d96d 100644 --- a/tests/controller/ext/foo/config/routing.yml +++ b/tests/controller/ext/foo/config/routing.yml @@ -1,3 +1,7 @@ controller1: pattern: /foo defaults: { _controller: foo.controller:handle } + +include_controller2: + resource: "routing_2.yml" + prefix: /foo diff --git a/tests/controller/ext/foo/config/routing_2.yml b/tests/controller/ext/foo/config/routing_2.yml new file mode 100644 index 0000000000..35fff27037 --- /dev/null +++ b/tests/controller/ext/foo/config/routing_2.yml @@ -0,0 +1,3 @@ +controller2: + pattern: /bar + defaults: { _controller: foo.controller:handle } |