X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiTestCase.php;h=7e1f9d8775ef8fa4ccd9ec3841e78b716a18e62a;hb=abb4d29b54c1bc4b4fb620f1124559ead13a074e;hp=e90b46faa35fd7f33f69b0844989a12d2aeeb604;hpb=857817b687edc8b8035db842ed61c2e5b16c5f2d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index e90b46faa3..7e1f9d8775 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -9,7 +9,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	protected $apiContext;
 
 	protected function setUp() {
-		global $wgServer, $wgDisableAuthManager;
+		global $wgServer;
 
 		parent::setUp();
 		self::$apiUrl = $wgServer . wfScript( 'api' );
@@ -22,9 +22,9 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		];
 
 		$this->setMwGlobals( [
-			'wgAuth' => $wgDisableAuthManager ? new AuthPlugin : new MediaWiki\Auth\AuthManagerAuthPlugin,
+			'wgAuth' => new MediaWiki\Auth\AuthManagerAuthPlugin,
 			'wgRequest' => new FauxRequest( [] ),
-			'wgUser' => self::$users['sysop']->user,
+			'wgUser' => self::$users['sysop']->getUser(),
 		] );
 
 		$this->apiContext = new ApiTestContext();
@@ -158,8 +158,8 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
 		$data = $this->doApiRequest( [
 			'action' => 'login',
-			'lgname' => $testUser->username,
-			'lgpassword' => $testUser->password ] );
+			'lgname' => $testUser->getUser()->getName(),
+			'lgpassword' => $testUser->getPassword() ] );
 
 		$token = $data[0]['login']['token'];
 
@@ -167,8 +167,8 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 			[
 				'action' => 'login',
 				'lgtoken' => $token,
-				'lgname' => $testUser->username,
-				'lgpassword' => $testUser->password,
+				'lgname' => $testUser->getUser()->getName(),
+				'lgpassword' => $testUser->getPassword(),
 			],
 			$data[2]
 		);
@@ -183,11 +183,11 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		return $data;
 	}
 
-	protected function getTokenList( $user, $session = null ) {
+	protected function getTokenList( TestUser $user, $session = null ) {
 		$data = $this->doApiRequest( [
 			'action' => 'tokens',
 			'type' => 'edit|delete|protect|move|block|unblock|watch'
-		], $session, false, $user->user );
+		], $session, false, $user->getUser() );
 
 		if ( !array_key_exists( 'tokens', $data[0] ) ) {
 			throw new MWException( 'Api failed to return a token list' );