Merge "Add missing return types to User::getOption()"

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

diff --git a/tests/phpunit/includes/MergeHistoryTest.php b/tests/phpunit/includes/MergeHistoryTest.php
index 22f6fa6..54db581 100644 (file)
--- a/tests/phpunit/includes/MergeHistoryTest.php
+++ b/tests/phpunit/includes/MergeHistoryTest.php
@@ -68,7 +68,7 @@ class MergeHistoryTest extends MediaWikiTestCase {
        public function testIsValidMergeRevisionLimit() {
                $limit = MergeHistory::REVISION_LIMIT;
 
-               $mh = $this->getMockBuilder( 'MergeHistory' )
+               $mh = $this->getMockBuilder( MergeHistory::class )
                        ->setMethods( [ 'getRevisionCount' ] )
                        ->setConstructorArgs( [
                                Title::newFromText( 'Test' ),
@@ -97,13 +97,12 @@ class MergeHistoryTest extends MediaWikiTestCase {
                );
 
                // Sysop with mergehistory permission
-               $sysop = User::newFromName( 'UTSysop' );
+               $sysop = static::getTestSysop()->getUser();
                $status = $mh->checkPermissions( $sysop, '' );
                $this->assertTrue( $status->isOK() );
 
                // Normal user
-               $notSysop = User::newFromName( 'UTNotSysop' );
-               $notSysop->addToDatabase();
+               $notSysop = static::getTestUser()->getUser();
                $status = $mh->checkPermissions( $notSysop, '' );
                $this->assertTrue( $status->hasMessage( 'mergehistory-fail-permission' ) );
        }
@@ -118,7 +117,8 @@ class MergeHistoryTest extends MediaWikiTestCase {
                        Title::newFromText( 'Merge2' )
                );
 
-               $mh->merge( User::newFromName( 'UTSysop' ) );
+               $sysop = static::getTestSysop()->getUser();
+               $mh->merge( $sysop );
                $this->assertEquals( $mh->getMergedRevisionCount(), 1 );
        }
 }