Merge "Revert "selenium: add new message banner test to user spec""

[lhc/web/wiklou.git] / tests / phpunit / includes / auth / AuthManagerTest.php

diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index a840599..b8f7b73 100644 (file)
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -149,7 +149,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                if ( $canChangeUser !== null ) {
                        $methods[] = 'canChangeUser';
                }
-               $provider = $this->getMockBuilder( 'DummySessionProvider' )
+               $provider = $this->getMockBuilder( \DummySessionProvider::class )
                        ->setMethods( $methods )
                        ->getMock();
                $provider->expects( $this->any() )->method( '__toString' )
@@ -968,7 +968,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        $p->expects( $this->atMost( 1 ) )->method( 'postAuthentication' )
                                ->willReturnCallback( function ( $user, $response ) use ( $constraint, $p ) {
                                        if ( $user !== null ) {
-                                               $this->assertInstanceOf( 'User', $user );
+                                               $this->assertInstanceOf( \User::class, $user );
                                                $this->assertSame( 'UTSysop', $user->getName() );
                                        }
                                        $this->assertInstanceOf( AuthenticationResponse::class, $response );
@@ -1408,7 +1408,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $readOnlyMode = \MediaWiki\MediaWikiServices::getInstance()->getReadOnlyMode();
                $readOnlyMode->setReason( 'Because' );
                $this->assertEquals(
-                       \Status::newFatal( 'readonlytext', 'Because' ),
+                       \Status::newFatal( wfMessage( 'readonlytext', 'Because' ) ),
                        $this->manager->checkAccountCreatePermissions( new \User )
                );
                $readOnlyMode->setReason( false );
@@ -1998,7 +1998,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                                ->willReturnCallback( function ( $user, $creator, $response )
                                        use ( $constraint, $p, $username )
                                {
-                                       $this->assertInstanceOf( 'User', $user );
+                                       $this->assertInstanceOf( \User::class, $user );
                                        $this->assertSame( $username, $user->getName() );
                                        $this->assertSame( 'UTSysop', $creator->getName() );
                                        $this->assertInstanceOf( AuthenticationResponse::class, $response );
@@ -2262,7 +2262,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
 
                // Set up lots of mocks...
                $mock = $this->getMockForAbstractClass(
-                       "MediaWiki\\Auth\\PrimaryAuthenticationProvider", []
+                       \MediaWiki\Auth\PrimaryAuthenticationProvider::class, []
                );
                $mock->expects( $this->any() )->method( 'getUniqueId' )
                        ->will( $this->returnValue( 'primary' ) );
@@ -2478,7 +2478,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $this->hook( 'LocalUserCreated', $this->never() );
                $ret = $this->manager->autoCreateUser( $user, AuthManager::AUTOCREATE_SOURCE_SESSION, true );
                $this->unhook( 'LocalUserCreated' );
-               $this->assertEquals( \Status::newFatal( 'readonlytext', 'Because' ), $ret );
+               $this->assertEquals( \Status::newFatal( wfMessage( 'readonlytext', 'Because' ) ), $ret );
                $this->assertEquals( 0, $user->getId() );
                $this->assertNotEquals( $username, $user->getName() );
                $this->assertEquals( 0, $session->getUser()->getId() );
@@ -2668,7 +2668,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
 
                // Test addToDatabase fails
                $session->clear();
-               $user = $this->getMockBuilder( 'User' )
+               $user = $this->getMockBuilder( \User::class )
                        ->setMethods( [ 'addToDatabase' ] )->getMock();
                $user->expects( $this->once() )->method( 'addToDatabase' )
                        ->will( $this->returnValue( \Status::newFatal( 'because' ) ) );
@@ -2690,7 +2690,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                $backoffKey = wfMemcKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
                $this->assertFalse( $cache->get( $backoffKey ), 'sanity check' );
                $session->clear();
-               $user = $this->getMockBuilder( 'User' )
+               $user = $this->getMockBuilder( \User::class )
                        ->setMethods( [ 'addToDatabase' ] )->getMock();
                $user->expects( $this->once() )->method( 'addToDatabase' )
                        ->will( $this->throwException( new \Exception( 'Excepted' ) ) );
@@ -2714,7 +2714,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
 
                // Test addToDatabase fails because the user already exists.
                $session->clear();
-               $user = $this->getMockBuilder( 'User' )
+               $user = $this->getMockBuilder( \User::class )
                        ->setMethods( [ 'addToDatabase' ] )->getMock();
                $user->expects( $this->once() )->method( 'addToDatabase' )
                        ->will( $this->returnCallback( function () use ( $username, &$user ) {
@@ -3474,7 +3474,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
                        $p->postCalled = false;
                        $p->expects( $this->atMost( 1 ) )->method( 'postAccountLink' )
                                ->willReturnCallback( function ( $user, $response ) use ( $constraint, $p ) {
-                                       $this->assertInstanceOf( 'User', $user );
+                                       $this->assertInstanceOf( \User::class, $user );
                                        $this->assertSame( 'UTSysop', $user->getName() );
                                        $this->assertInstanceOf( AuthenticationResponse::class, $response );
                                        $this->assertThat( $response->status, $constraint );