diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-17 11:05:18 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-17 11:40:10 +0100 |
| commit | 6842831d6baa59425ec83cc2ebbae377942824ce (patch) | |
| tree | 991136c6fc7b063d5fabe64750c9e1f7db433ba8 /tests/controller | |
| parent | 0344e61b8cd5d3964bcfae147e2bebc8c74fa3be (diff) | |
| download | forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar.gz forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar.bz2 forums-6842831d6baa59425ec83cc2ebbae377942824ce.tar.xz forums-6842831d6baa59425ec83cc2ebbae377942824ce.zip | |
[ticket/13513] Use paths relative to the phpBB root in the router
PHPBB3-13513
Diffstat (limited to 'tests/controller')
| -rw-r--r-- | tests/controller/common_helper_route.php | 2 | ||||
| -rw-r--r-- | tests/controller/controller_test.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 19d40cf071..3f98d51f16 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -114,7 +114,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case ); $this->router = new phpbb_mock_router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); - $this->router->find_routing_files($this->extension_manager->all_enabled()); + $this->router->find_routing_files($this->extension_manager->all_enabled(false)); $this->router->find(dirname(__FILE__) . '/'); // Set correct current phpBB root path $this->root_path = $this->get_phpbb_root_path(); diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php index 354a902831..86615fe4dc 100644 --- a/tests/controller/controller_test.php +++ b/tests/controller/controller_test.php @@ -41,7 +41,7 @@ class phpbb_controller_controller_test extends phpbb_test_case public function test_router_find_files() { $router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); - $router->find_routing_files($this->extension_manager->all_enabled()); + $router->find_routing_files($this->extension_manager->all_enabled(false)); $routes = $router->find(__DIR__)->get_routes(); // This will need to be updated if any new routes are defined |