2 files changed, 38 insertions, 28 deletions
diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php
index f314d35f87..f0d1cdb60e 100644
--- a/tests/session/extract_page_test.php
+++ b/tests/session/extract_page_test.php
@@ -12,6 +12,7 @@
 */
 
 require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_session_extract_page_test extends phpbb_session_test_case
 {
@@ -99,7 +100,7 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 					// ^-- Ignored because .. returns different directory in live vs testing
 					'query_string' => '',
 					'script_path' => '/phpBB/adm/',
-					//'root_script_path' => '/phpBB/',
+					//'root_script_path' => '/phpBB/adm/',
 					//'page' => 'adm/index.php',
 					'forum' => 0,
 				),
@@ -108,15 +109,15 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 				'./',
 				'/phpBB/adm/app.php',
 				'page=1&test=2',
-				'/phpBB/',
+				'/phpBB/adm/',
 				'/foo/bar',
 				array(
 					'page_name' => 'app.php/foo/bar',
-					'page_dir' => '',
+					//'page_dir' => '',
 					'query_string' => 'page=1&test=2',
-					'script_path' => '/phpBB/',
-					'root_script_path' => '/phpBB/',
-					'page' => 'app.php/foo/bar?page=1&test=2',
+					'script_path' => '/phpBB/adm/',
+					//'root_script_path' => '/phpBB/adm/',
+					//'page' => 'app.php/foo/bar?page=1&test=2',
 					'forum' => 0,
 				),
 			),
@@ -142,23 +143,25 @@ class phpbb_session_extract_page_test extends phpbb_session_test_case
 	/** @dataProvider extract_current_page_data */
 	function test_extract_current_page($root_path, $getScriptName, $getQueryString, $getBasePath, $getPathInfo, $expected)
 	{
-		global $symfony_request;
+		global $symfony_request, $request, $phpbb_filesystem;
+
+		$phpbb_filesystem = new \phpbb\filesystem();
+
+		$server['HTTP_HOST']			= 'localhost';
+		$server['SERVER_NAME']			= 'localhost';
+		$server['SERVER_ADDR']			= '127.0.0.1';
+		$server['SERVER_PORT']			= 80;
+		$server['REMOTE_ADDR']			= '127.0.0.1';
+		$server['QUERY_STRING']			= $getQueryString;
+		$server['REQUEST_URI']			= $getScriptName . $getPathInfo . ($getQueryString === '' ? '' : '?' . $getQueryString);
+		$server['SCRIPT_NAME']			= $getScriptName;
+		$server['SCRIPT_FILENAME']		= '/var/www/' . $getScriptName;
+		$server['PHP_SELF']				= $getScriptName;
+		$server['HTTP_USER_AGENT']		= 'Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14';
+		$server['HTTP_ACCEPT_LANGUAGE']	= 'de-de,de;q=0.8,en-us;q=0.5,en;q=0.3';
 
-		$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));
+		$request = new phpbb_mock_request(array(), array(), array(), $server);
+		$symfony_request = new \phpbb\symfony_request($request);
 
 		$output = \phpbb\session::extract_current_page($root_path);
 
diff --git a/tests/session/session_key_test.php b/tests/session/session_key_test.php
index 31a470615c..bf3dfcaa3c 100644
--- a/tests/session/session_key_test.php
+++ b/tests/session/session_key_test.php
@@ -11,6 +11,7 @@
 *
 */
 
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
 class phpbb_session_login_keys_test extends phpbb_session_test_case
@@ -28,13 +29,14 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case
 		// With AutoLogin setup
 		$this->session_factory->merge_config_data(array('allow_autologin' => true));
 		$session = $this->session_factory->get_session($this->db);
+
 		// Using a user_id and key that is already in the database
 		$session->cookie_data['u'] = $this->user_id;
 		$session->cookie_data['k'] = $this->key_id;
-		// Try to access session
-		$session->session_create($this->user_id, false, $this->user_id);
 
-		$this->assertEquals($this->user_id, $session->data['user_id'], "session should automatically login");
+		// Try to access session with the session key
+		$session->session_create(false, false, false);
+		$this->assertEquals($this->user_id, $session->data['user_id'], 'User should be logged in by the session key');
 	}
 
 	public function test_reset_keys()
@@ -42,14 +44,19 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case
 		// With AutoLogin setup
 		$this->session_factory->merge_config_data(array('allow_autologin' => true));
 		$session = $this->session_factory->get_session($this->db);
+
 		// Reset of the keys for this user
 		$session->reset_login_keys($this->user_id);
+
 		// Using a user_id and key that was in the database (before reset)
 		$session->cookie_data['u'] = $this->user_id;
 		$session->cookie_data['k'] = $this->key_id;
-		// Try to access session
-		$session->session_create($this->user_id, false, $this->user_id);
 
-		$this->assertNotEquals($this->user_id, $session->data['user_id'], "session should be cleared");
+		// Try to access session with the session key
+		$session->session_create(false, false, $this->user_id);
+		$this->assertNotEquals($this->user_id, $session->data['user_id'], 'User is not logged in because the session key is invalid');
+
+		$session->session_create($this->user_id, false, false);
+		$this->assertEquals($this->user_id, $session->data['user_id'], 'User should be logged in because we create a new session');
 	}
 }