aboutsummaryrefslogtreecommitdiffstats
path: root/tests/controller/controller_test.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-07 12:42:06 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-07 14:07:45 +0100
commitecf1e94726a8a1e0f8d30aba3935e1899c2c6adc (patch)
tree9741193dbe144ed3635e18095fc110272acc3d42 /tests/controller/controller_test.php
parent51273f6fb1421b68c1931c3960f68cd483f1ee95 (diff)
downloadforums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar
forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar.gz
forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar.bz2
forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar.xz
forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.zip
[ticket/12090] Change redirect tests to use route()
PHPBB3-12090
Diffstat (limited to 'tests/controller/controller_test.php')
-rw-r--r--tests/controller/controller_test.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index b65e677dbe..8709f449db 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -21,10 +21,10 @@ class phpbb_controller_controller_test extends phpbb_test_case
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
array(
- 'foo' => array(
- 'ext_name' => 'foo',
+ 'vendor2/foo' => array(
+ 'ext_name' => 'vendor2/foo',
'ext_active' => '1',
- 'ext_path' => 'ext/foo/',
+ 'ext_path' => 'ext/vendor2/foo/',
),
));
}
@@ -52,7 +52,7 @@ class phpbb_controller_controller_test extends phpbb_test_case
$container = new ContainerBuilder();
// YamlFileLoader only uses one path at a time, so we need to loop
// through all of the ones we are using.
- foreach (array(__DIR__.'/config', __DIR__.'/ext/foo/config') as $path)
+ foreach (array(__DIR__.'/config', __DIR__ . '/ext/vendor2/foo/config') as $path)
{
$loader = new YamlFileLoader($container, new FileLocator($path));
$loader->load('services.yml');
@@ -60,9 +60,9 @@ class phpbb_controller_controller_test extends phpbb_test_case
// Autoloading classes within the tests folder does not work
// so I'll include them manually.
- if (!class_exists('foo\\controller'))
+ if (!class_exists('vendor2\\foo\\controller'))
{
- include(__DIR__ . '/ext/foo/controller.php');
+ include(__DIR__ . '/ext/vendor2/foo/controller.php');
}
if (!class_exists('phpbb\\controller\\foo'))
{