diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 22:40:37 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 23:15:49 +0100 |
| commit | 677b5b2cd4937ee6c777728082084c661223dee8 (patch) | |
| tree | 4342890f46004943e15a2cfd8ccdd559619bb53c /tests/controller/common_helper_route.php | |
| parent | 93f61a4a7d34f8ad565bdc1605784284994ecdfc (diff) | |
| download | forums-677b5b2cd4937ee6c777728082084c661223dee8.tar forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.gz forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.bz2 forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.xz forums-677b5b2cd4937ee6c777728082084c661223dee8.zip | |
[ticket/12620] Fix rebase
PHPBB3-12620
Diffstat (limited to 'tests/controller/common_helper_route.php')
| -rw-r--r-- | tests/controller/common_helper_route.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 5baa846ec3..19d40cf071 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -113,8 +113,8 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case ) ); - $this->router = new phpbb_mock_router($this->extension_manager, dirname(__FILE__) . '/', 'php'); - $this->router->find_routing_files($finder); + $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(dirname(__FILE__) . '/'); // Set correct current phpBB root path $this->root_path = $this->get_phpbb_root_path(); @@ -319,7 +319,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case $this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/'); $this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH), $description); } -//TODO + public function helper_url_data_absolute_with_rewrite() { return array( |