mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/11850] page_name contains controller request rather than query string

Browse Source 
Fixing tests

PHPBB3-11850
This commit is contained in:
Nathan Guse
2013-09-17 22:00:06 -05:00
parent f4317bc864
commit 9c535da528
4 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
tests/session/extract_page_test.php
View File

@@ -24,6 +24,7 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
'/phpBB/index.php',
'',
'/phpBB/',
'/',
array(
'page_name' => 'index.php',
'page_dir' => '',
@@ -38,7 +39,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
'./',
'/phpBB/ucp.php',
'mode=login',
'/phpBB/ucp.php?mode=login',
'/phpBB/',
'/',
array(
'page_name' => 'ucp.php',
'page_dir' => '',
@@ -53,7 +55,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
'./',
'/phpBB/ucp.php',
'mode=register',
'/phpBB/ucp.php?mode=register',
'/phpBB/',
'/',
array(
'page_name' => 'ucp.php',
'page_dir' => '',
@@ -68,7 +71,8 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
'./',
'/phpBB/ucp.php',
'mode=register',
'/phpBB/ucp.php?mode=register',
'/phpBB/',
'/',
array(
'page_name' => 'ucp.php',
'page_dir' => '',
@@ -83,30 +87,60 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
'./../',
'/phpBB/adm/index.php',
'sid=e7215d958cdd41a6fc13509bebe53e42',
'/phpBB/adm/index.php?sid=e7215d958cdd41a6fc13509bebe53e42',
'/phpBB/adm/',
'/',
array(
'page_name' => 'index.php',
//'page_dir' => 'adm',
// ^-- Ignored because .. returns different directory in live vs testing
'query_string' => '',
'script_path' => '/phpBB/adm/',
'root_script_path' => '/phpBB/',
//'root_script_path' => '/phpBB/',
//'page' => 'adm/index.php',
'forum' => 0,
),
),
array(
'./',
'/phpBB/adm/app.php',
'page=1&test=2',
'/phpBB/',
'/foo/bar',
array(
'page_name' => 'app.php/foo/bar',
'page_dir' => '',
'query_string' => 'page=1&test=2',
'script_path' => '/phpBB/',
'root_script_path' => '/phpBB/',
'page' => 'app.php/foo/bar?page=1&test=2',
'forum' => 0,
),
),
);
}
/** @dataProvider extract_current_page_data */
function test_extract_current_page($root_path, $php_self, $query_string, $request_uri, $expected)
function test_extract_current_page($root_path, $getScriptName, $getQueryString, $getBasePath, $getPathInfo, $expected)
{
$output = $this->session_facade->extract_current_page(
$root_path,
$php_self,
$query_string,
$request_uri
);
global $symfony_request;
$symfony_request = $this->getMock("phpbb_symfony_request", array(), array(
new phpbb_mock_request(),
));
$symfony_request->expects($this->any())
->method('getScriptName')
->will($this->returnValue($getScriptName));
$symfony_request->expects($this->any())
->method('getQueryString')
->will($this->returnValue($getQueryString));
$symfony_request->expects($this->any())
->method('getBasePath')
->will($this->returnValue($getBasePath));
$symfony_request->expects($this->any())
->method('getPathInfo')
->will($this->returnValue($getPathInfo));
$output = phpbb_session::extract_current_page($root_path);
// This compares the result of the output.
// Any keys that are not in the expected array are overwritten by the output (aka not checked).