From f32a30eecacba212850a11b7b4740d0a69bd49de Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 7 Dec 2013 13:28:44 +0100 Subject: [ticket/11997] Fix tests for path_helper's get_controller_redirect_url() PHPBB3-11997 --- tests/functional/extension_controller_test.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'tests/functional/extension_controller_test.php') 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'); -- cgit v1.2.1