diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-21 21:52:48 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-21 21:52:48 +0200 |
| commit | 51561ed538450d0e3d8392f3073004751e0b03f1 (patch) | |
| tree | e56c4a40c07da1a09632cfd313d655f5d1fd9c8b /tests | |
| parent | bd86dea16c2f2d0d8ac6677777d612480186764a (diff) | |
| download | forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar.gz forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar.bz2 forums-51561ed538450d0e3d8392f3073004751e0b03f1.tar.xz forums-51561ed538450d0e3d8392f3073004751e0b03f1.zip | |
[ticket/11948] Allow resource importing for routing
PHPBB3-11948
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/controller/controller_test.php | 2 | ||||
| -rw-r--r-- | tests/controller/ext/foo/config/routing.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 0e7cac05ec..c71fc92170 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -34,7 +34,7 @@ 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(3, sizeof($routes)); 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 |