diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-07-08 18:48:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-07-08 18:48:32 +0200 |
| commit | b13293947140408b634a71085efd7e255f507377 (patch) | |
| tree | 9573e13930000dbbb1f5edcc0ec931d6482555f5 /tests | |
| parent | 91f5d59f69f6257eed1bb86f43c35d614aa06533 (diff) | |
| parent | e3e236da72f9bb8985fcecc25758c98559f76179 (diff) | |
| download | forums-b13293947140408b634a71085efd7e255f507377.tar forums-b13293947140408b634a71085efd7e255f507377.tar.gz forums-b13293947140408b634a71085efd7e255f507377.tar.bz2 forums-b13293947140408b634a71085efd7e255f507377.tar.xz forums-b13293947140408b634a71085efd7e255f507377.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeus
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/viewonline/helper_test.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php index e4950bb51a..bbbed59de7 100644 --- a/tests/viewonline/helper_test.php +++ b/tests/viewonline/helper_test.php @@ -17,23 +17,27 @@ class phpbb_viewonline_helper_test extends phpbb_test_case { parent::setUp(); - $this->viewonline_helper = new \phpbb\viewonline_helper(); + $this->viewonline_helper = new \phpbb\viewonline_helper(new \phpbb\filesystem()); } public function session_pages_data() { return array( - array('index.php', 'index.php'), - array('foobar/test.php', 'foobar/test.php'), + array('index.php', 'index'), + array('foobar/test.php', 'foobar/test'), array('', ''), - array('../index.php', '../index.php'), + array('./../../index.php', '../../index'), + array('../subdir/index.php', '../subdir/index'), + array('../index.php', '../index'), + array('././index.php', 'index'), + array('./index.php', 'index'), ); } /** * @dataProvider session_pages_data */ - public function test_get_user_page($expected, $session_page) + public function test_get_user_page($session_page, $expected) { $on_page = $this->viewonline_helper->get_user_page($session_page); $this->assertArrayHasKey(1, $on_page); |