diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2014-06-10 21:06:36 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-10 21:06:36 +0200 |
| commit | e71f65c2bb8a810f669b275856cf7e3654d34810 (patch) | |
| tree | ffc724a4e111bbadfa844d88e19c2b9c510ac04c /tests/path_helper | |
| parent | [ticket/12099] Prepend ./ to path to fix assets (diff) | |
| download | phpbb-e71f65c2bb8a810f669b275856cf7e3654d34810.tar.gz phpbb-e71f65c2bb8a810f669b275856cf7e3654d34810.tar.bz2 phpbb-e71f65c2bb8a810f669b275856cf7e3654d34810.zip | |
[ticket/12099] Fix correction in path_helper test
PHPBB3-12099
Diffstat (limited to 'tests/path_helper')
| -rw-r--r-- | tests/path_helper/path_helper_test.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index 4eac2f567b..9866cb6efe 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -94,41 +94,45 @@ class phpbb_path_helper_test extends phpbb_test_case return array( array( $this->phpbb_root_path . 'test.php', - '', '/', + null, + null, + '', ), array( $this->phpbb_root_path . 'test.php', - '../', '//', + null, + null, + './../', ), array( $this->phpbb_root_path . 'test.php', - '../', '//', 'foo/bar.php', 'bar.php', + './../', ), array( $this->phpbb_root_path . 'test.php', - '../../', '/foo/template', '/phpbb3-fork/phpBB/app.php/foo/template', '/phpbb3-fork/phpBB/app.php', + './../../', ), array( $this->phpbb_root_path . 'test.php', - '../', '/foo/template', '/phpbb3-fork/phpBB/foo/template', '/phpbb3-fork/phpBB/app.php', + './../', ), array( $this->phpbb_root_path . 'test.php', - '../', '/', '/phpbb3-fork/phpBB/app.php/', '/phpbb3-fork/phpBB/app.php', + './../', ), ); } @@ -136,7 +140,7 @@ class phpbb_path_helper_test extends phpbb_test_case /** * @dataProvider update_web_root_path_data */ - public function test_update_web_root_path($input, $correction, $getPathInfo, $getRequestUri = null, $getScriptName = null) + public function test_update_web_root_path($input, $getPathInfo, $getRequestUri, $getScriptName, $correction) { $symfony_request = $this->getMock('\phpbb\symfony_request', array(), array( new phpbb_mock_request(), |