aboutsummaryrefslogtreecommitdiffstats
path: root/tests/controller/controller_test.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-11-20 18:50:32 +0100
committerNils Adermann <naderman@naderman.de>2014-11-20 18:50:32 +0100
commit6fa0ca1f96fa75624ab2b4fca8b390568440b3c1 (patch)
treed1a55c1e2e28f25c05f655273d8e1950340ba04e /tests/controller/controller_test.php
parent3b1c611566399c1e06bd737ec283b141e3c410f5 (diff)
parent8be2f119af6164ee103330a15123d977fc1c07ea (diff)
downloadforums-6fa0ca1f96fa75624ab2b4fca8b390568440b3c1.tar
forums-6fa0ca1f96fa75624ab2b4fca8b390568440b3c1.tar.gz
forums-6fa0ca1f96fa75624ab2b4fca8b390568440b3c1.tar.bz2
forums-6fa0ca1f96fa75624ab2b4fca8b390568440b3c1.tar.xz
forums-6fa0ca1f96fa75624ab2b4fca8b390568440b3c1.zip
Merge pull request #2957 from Nicofuma/ticket/13063
[ticket/13063] Introduces a new \phpbb\routing\router class
Diffstat (limited to 'tests/controller/controller_test.php')
-rw-r--r--tests/controller/controller_test.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 62feee3fed..cd90dda751 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -33,11 +33,11 @@ class phpbb_controller_controller_test extends phpbb_test_case
));
}
- public function test_provider()
+ public function test_router_find_files()
{
- $provider = new \phpbb\controller\provider();
- $provider->find_routing_files($this->extension_manager->get_finder());
- $routes = $provider->find(__DIR__)->get_routes();
+ $router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php');
+ $router->find_routing_files($this->extension_manager->get_finder());
+ $routes = $router->find(__DIR__)->get_routes();
// This will need to be updated if any new routes are defined
$this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('core_controller'));