From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
---
 tests/phpunit/includes/api/ApiTestCase.php | 59 +++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 21 deletions(-)

(limited to 'tests/phpunit/includes/api/ApiTestCase.php')

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 8801391f..b84292e3 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -1,10 +1,6 @@
 <?php 
 
 abstract class ApiTestCase extends MediaWikiLangTestCase {
-	/**
-	 * @var Array of ApiTestUser
-	 */
-	public static $users;
 	protected static $apiUrl;
 
 	/**
@@ -23,13 +19,13 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		$wgRequest = new FauxRequest( array() );
 
 		self::$users = array(
-			'sysop' => new ApiTestUser(
+			'sysop' => new TestUser(
 				'Apitestsysop',
 				'Api Test Sysop',
 				'api_test_sysop@example.com',
 				array( 'sysop' )
 			),
-			'uploader' => new ApiTestUser(
+			'uploader' => new TestUser(
 				'Apitestuser',
 				'Api Test User',
 				'api_test_user@example.com',
@@ -43,15 +39,31 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
 	}
 
-	protected function doApiRequest( $params, $session = null, $appendModule = false, $user = null ) {
+	protected function doApiRequest( Array $params, Array $session = null, $appendModule = false, User $user = null ) {
+		global $wgRequest, $wgUser;
+
 		if ( is_null( $session ) ) {
-			$session = array();
+			# re-use existing global session by default
+			$session = $wgRequest->getSessionArray();
 		}
 
-		$context = $this->apiContext->newTestContext( $params, $session, $user );
+		# set up global environment
+		if ( $user ) {
+			$wgUser = $user;
+		}
+
+		$wgRequest = new FauxRequest( $params, true, $session );
+		RequestContext::getMain()->setRequest( $wgRequest );
+
+		# set up local environment
+		$context = $this->apiContext->newTestContext( $wgRequest, $wgUser );
+
 		$module = new ApiMain( $context, true );
+
+		# run it!
 		$module->execute();
 
+		# construct result
 		$results = array(
 			$module->getResultData(),
 			$context->getRequest(),
@@ -68,11 +80,17 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	 * Add an edit token to the API request
 	 * This is cheating a bit -- we grab a token in the correct format and then add it to the pseudo-session and to the
 	 * request, without actually requesting a "real" edit token
-	 * @param $params: key-value API params
-	 * @param $session: session array
-	 * @param $user String|null A User object for the context 
+	 * @param $params Array: key-value API params
+	 * @param $session Array|null: session array
+	 * @param $user User|null A User object for the context
 	 */
-	protected function doApiRequestWithToken( $params, $session, $user = null ) {
+	protected function doApiRequestWithToken( Array $params, Array $session = null, User $user = null ) {
+		global $wgRequest;
+
+		if ( $session === null ) {
+			$session = $wgRequest->getSessionArray();
+		}
+
 		if ( $session['wsToken'] ) {
 			// add edit token to fake session
 			$session['wsEditToken'] = $session['wsToken'];
@@ -97,17 +115,17 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 			'lgtoken' => $token,
 			'lgname' => self::$users['sysop']->username,
 			'lgpassword' => self::$users['sysop']->password
-			), $data );
+			), $data[2] );
 
 		return $data;
 	}
 
-	protected function getTokenList( $user ) {
+	protected function getTokenList( $user, $session = null ) {
 		$data = $this->doApiRequest( array(
 			'action' => 'query',
 			'titles' => 'Main Page',
-			'intoken' => 'edit|delete|protect|move|block|unblock',
-			'prop' => 'info' ), false, $user->user );
+			'intoken' => 'edit|delete|protect|move|block|unblock|watch',
+			'prop' => 'info' ), $session, false, $user->user );
 		return $data;
 	}
 }
@@ -154,14 +172,13 @@ class ApiTestContext extends RequestContext {
 	/**
 	 * Returns a DerivativeContext with the request variables in place
 	 *
-	 * @param $params Array key-value API params
-	 * @param $session Array session data
+	 * @param $request WebRequest request object including parameters and session
 	 * @param $user User or null
 	 * @return DerivativeContext
 	 */
-	public function newTestContext( $params, $session, $user = null ) {
+	public function newTestContext( WebRequest $request, User $user = null ) {
 		$context = new DerivativeContext( $this );
-		$context->setRequest( new FauxRequest( $params, true, $session ) );
+		$context->setRequest( $request );
 		if ( $user !== null ) {
 			$context->setUser( $user );
 		}
-- 
cgit v1.2.3-54-g00ecf