X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMergeHistoryTest.php;h=f44ae322727e61555c3d277ff066485055ad24aa;hp=22f6fa6a585f9f07f0a9abe27613f3f05ceb3d4d;hb=8956885666e4678a8ff76f7310396d2b2874a858;hpb=086fd2799fd388ae7d93c90bb3aec6a59ba07cf5

diff --git a/tests/phpunit/includes/MergeHistoryTest.php b/tests/phpunit/includes/MergeHistoryTest.php
index 22f6fa6a58..f44ae32272 100644
--- a/tests/phpunit/includes/MergeHistoryTest.php
+++ b/tests/phpunit/includes/MergeHistoryTest.php
@@ -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 );
 	}
 }