X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fsession%2FBotPasswordSessionProviderTest.php;h=d76d9dfc8a98934d09d4713c4ef3af0ba83a232e;hb=425090d4eb0b9de89ad6818f40ab8295368f645e;hp=590f2878ba24b6830d76be3a7a8dfce60aad926b;hpb=fb7b3eebeb8de47eb42e8d6ccf204106a2d6d9e4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php b/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
index 590f2878ba..9bc41c06b3 100644
--- a/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
+++ b/tests/phpunit/includes/session/BotPasswordSessionProviderTest.php
@@ -33,8 +33,8 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 				'EnableBotPasswords' => true,
 				'BotPasswordsDatabase' => false,
 				'SessionProviders' => $wgSessionProviders + [
-					'MediaWiki\\Session\\BotPasswordSessionProvider' => [
-						'class' => 'MediaWiki\\Session\\BotPasswordSessionProvider',
+					BotPasswordSessionProvider::class => [
+						'class' => BotPasswordSessionProvider::class,
 						'args' => [ $params ],
 					]
 				],
@@ -46,7 +46,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 			'store' => new TestBagOStuff,
 		] );
 
-		return $manager->getProvider( 'MediaWiki\\Session\\BotPasswordSessionProvider' );
+		return $manager->getProvider( BotPasswordSessionProvider::class );
 	}
 
 	protected function setUp() {
@@ -62,14 +62,13 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 		] );
 	}
 
-	public function addDBData() {
+	public function addDBDataOnce() {
 		$passwordFactory = new \PasswordFactory();
 		$passwordFactory->init( \RequestContext::getMain()->getConfig() );
-		// A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only
-		$passwordFactory->setDefaultType( 'A' );
-		$pwhash = $passwordFactory->newFromPlaintext( 'foobaz' );
+		$passwordHash = $passwordFactory->newFromPlaintext( 'foobaz' );
 
-		$userId = \CentralIdLookup::factory( 'local' )->centralIdFromName( 'UTSysop' );
+		$sysop = static::getTestSysop()->getUser();
+		$userId = \CentralIdLookup::factory( 'local' )->centralIdFromName( $sysop->getName() );
 
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->delete(
@@ -82,7 +81,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 			[
 				'bp_user' => $userId,
 				'bp_app_id' => 'BotPasswordSessionProvider',
-				'bp_password' => $pwhash->toString(),
+				'bp_password' => $passwordHash->toString(),
 				'bp_token' => 'token!',
 				'bp_restrictions' => '{"IPAddresses":["127.0.0.0/8"]}',
 				'bp_grants' => '["test"]',
@@ -154,7 +153,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 	public function testBasics() {
 		$provider = $this->getProvider();
 
-		$this->assertTrue( $provider->persistsSessionID() );
+		$this->assertTrue( $provider->persistsSessionId() );
 		$this->assertFalse( $provider->canChangeUser() );
 
 		$this->assertNull( $provider->newSessionInfo() );
@@ -172,7 +171,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 		}
 
 		$info = $provider->provideSessionInfo( $request );
-		$this->assertInstanceOf( 'MediaWiki\\Session\\SessionInfo', $info );
+		$this->assertInstanceOf( SessionInfo::class, $info );
 		$this->assertSame( 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', $info->getId() );
 
 		$this->config->set( 'EnableBotPasswords', false );
@@ -184,14 +183,14 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 
 	public function testNewSessionInfoForRequest() {
 		$provider = $this->getProvider();
-		$user = \User::newFromName( 'UTSysop' );
+		$user = static::getTestSysop()->getUser();
 		$request = $this->getMock( 'FauxRequest', [ 'getIP' ] );
 		$request->expects( $this->any() )->method( 'getIP' )
 			->will( $this->returnValue( '127.0.0.1' ) );
 		$bp = \BotPassword::newFromUser( $user, 'BotPasswordSessionProvider' );
 
 		$session = $provider->newSessionForRequest( $user, $bp, $request );
-		$this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session );
+		$this->assertInstanceOf( Session::class, $session );
 
 		$this->assertEquals( $session->getId(), $request->getSession()->getId() );
 		$this->assertEquals( $user->getName(), $session->getUser()->getName() );
@@ -211,7 +210,7 @@ class BotPasswordSessionProviderTest extends MediaWikiTestCase {
 		$provider = $this->getProvider();
 		$provider->setLogger( $logger );
 
-		$user = \User::newFromName( 'UTSysop' );
+		$user = static::getTestSysop()->getUser();
 		$request = $this->getMock( 'FauxRequest', [ 'getIP' ] );
 		$request->expects( $this->any() )->method( 'getIP' )
 			->will( $this->returnValue( '127.0.0.1' ) );