aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional/extension_controller_test.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-12-07 13:28:44 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-12-07 13:28:44 +0100
commitf32a30eecacba212850a11b7b4740d0a69bd49de (patch)
tree0e16041b781b9356564a1746005140f78ad60894 /tests/functional/extension_controller_test.php
parenta7f2788c72dd45b65de494ca72d13aaee3b140d6 (diff)
downloadforums-f32a30eecacba212850a11b7b4740d0a69bd49de.tar
forums-f32a30eecacba212850a11b7b4740d0a69bd49de.tar.gz
forums-f32a30eecacba212850a11b7b4740d0a69bd49de.tar.bz2
forums-f32a30eecacba212850a11b7b4740d0a69bd49de.tar.xz
forums-f32a30eecacba212850a11b7b4740d0a69bd49de.zip
[ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
PHPBB3-11997
Diffstat (limited to 'tests/functional/extension_controller_test.php')
-rw-r--r--tests/functional/extension_controller_test.php19
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index b280f01638..fe21ec5bd8 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -115,28 +115,27 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
*/
public function test_redirect()
{
+ $filesystem = new \phpbb\filesystem();
$this->phpbb_extension_manager->enable('foo/bar');
$crawler = self::request('GET', 'app.php/foo/redirect');
$test_redirects = array(
'index.php',
- '../index.php',
+ 'index.php',
+ 'tests/index.php',
'tests/index.php',
- '../tests/index.php',
'app.php/index',
- 'index',
- '../index',
+ 'app.php/index',
+ 'app.php/index',
+ 'app.php/tests/index',
+ 'app.php/tests/index',
+ 'app.php/tests/index',
'app.php/tests/index',
- 'tests/index',
- '../tests/index',
- 'index',
);
- $filesystem = new \phpbb\filesystem();
-
foreach ($test_redirects as $row_num => $redirect)
{
- $this->assertContains($filesystem->clean_path(self::$root_url . $redirect), $crawler->filter('#redirect_' . $row_num)->text());
+ $this->assertContains($filesystem->clean_path(self::$root_url) . $redirect, $crawler->filter('#redirect_' . $row_num)->text());
}
$this->phpbb_extension_manager->purge('foo/bar');