X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiTestCase.php;h=3cec99af90f61b62c857135f0061c65fd857c4b6;hb=8016a0d162e599969704b20560709116d39b6526;hp=f81bb6da23998a8e06060802fc6ebcb044710287;hpb=0e5c2ee3f23eadabb9d9856868b4406cb433f753;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index f81bb6da23..3cec99af90 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;
 
 	/**
@@ -22,14 +18,16 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		$wgAuth = new StubObject( 'wgAuth', 'AuthPlugin' );
 		$wgRequest = new FauxRequest( array() );
 
+		ApiQueryInfo::resetTokenCache(); // tokens are invalid because we cleared the session
+
 		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',
@@ -85,10 +83,16 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	 * 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 Array: key-value API params
-	 * @param $session Array: session array
+	 * @param $session Array|null: session array
 	 * @param $user User|null A User object for the context
 	 */
-	protected function doApiRequestWithToken( Array $params, Array $session, User $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'];
@@ -122,7 +126,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		$data = $this->doApiRequest( array(
 			'action' => 'query',
 			'titles' => 'Main Page',
-			'intoken' => 'edit|delete|protect|move|block|unblock',
+			'intoken' => 'edit|delete|protect|move|block|unblock|watch',
 			'prop' => 'info' ), $session, false, $user->user );
 		return $data;
 	}