diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-26 13:41:51 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-26 13:41:51 +0100 |
| commit | c9df29d680990d83fe2380e79a7bd5833f0cac34 (patch) | |
| tree | ccc4b685816311077c2002a3583d95266860e85d /tests | |
| parent | 261c3bc1d06a05ec7c0c18288b1a04a35819ec12 (diff) | |
| parent | 6842831d6baa59425ec83cc2ebbae377942824ce (diff) | |
| download | forums-c9df29d680990d83fe2380e79a7bd5833f0cac34.tar forums-c9df29d680990d83fe2380e79a7bd5833f0cac34.tar.gz forums-c9df29d680990d83fe2380e79a7bd5833f0cac34.tar.bz2 forums-c9df29d680990d83fe2380e79a7bd5833f0cac34.tar.xz forums-c9df29d680990d83fe2380e79a7bd5833f0cac34.zip | |
Merge pull request #3303 from Nicofuma/ticket/13513
[ticket/13513] Use paths relative to the phpBB root in the router
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/controller/common_helper_route.php | 2 | ||||
| -rw-r--r-- | tests/controller/controller_test.php | 2 | ||||
| -rw-r--r-- | tests/pagination/pagination_test.php | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index 63ae9b4207..6679d48c01 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -39,7 +39,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1')); $router = new phpbb_mock_router($manager, dirname(__FILE__) . '/', 'php', PHPBB_ENVIRONMENT); - $router->find_routing_files($manager->all_enabled()); + $router->find_routing_files($manager->all_enabled(false)); $router->find(dirname(__FILE__) . '/'); $request = new phpbb_mock_request(); |