dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(bug 40353) SpecialDoubleRedirect: Fix for interwiki redirects"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
api
/
ApiTestCase.php
diff --git
a/tests/phpunit/includes/api/ApiTestCase.php
b/tests/phpunit/includes/api/ApiTestCase.php
index
d6c48cb
..
3cec99a
100644
(file)
--- a/
tests/phpunit/includes/api/ApiTestCase.php
+++ b/
tests/phpunit/includes/api/ApiTestCase.php
@@
-1,10
+1,6
@@
<?php
abstract class ApiTestCase extends MediaWikiLangTestCase {
<?php
abstract class ApiTestCase extends MediaWikiLangTestCase {
- /**
- * @var Array of ApiTestUser
- */
- public static $users;
protected static $apiUrl;
/**
protected static $apiUrl;
/**
@@
-22,14
+18,16
@@
abstract class ApiTestCase extends MediaWikiLangTestCase {
$wgAuth = new StubObject( 'wgAuth', 'AuthPlugin' );
$wgRequest = new FauxRequest( array() );
$wgAuth = new StubObject( 'wgAuth', 'AuthPlugin' );
$wgRequest = new FauxRequest( array() );
+ ApiQueryInfo::resetTokenCache(); // tokens are invalid because we cleared the session
+
self::$users = array(
self::$users = array(
- 'sysop' => new
Api
TestUser(
+ 'sysop' => new TestUser(
'Apitestsysop',
'Api Test Sysop',
'api_test_sysop@example.com',
array( 'sysop' )
),
'Apitestsysop',
'Api Test Sysop',
'api_test_sysop@example.com',
array( 'sysop' )
),
- 'uploader' => new
Api
TestUser(
+ 'uploader' => new TestUser(
'Apitestuser',
'Api Test User',
'api_test_user@example.com',
'Apitestuser',
'Api Test User',
'api_test_user@example.com',