X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FRevision%2FRevisionRendererTest.php;h=d1418c28c82987ab41ed5de8ff1941516a92f58e;hb=82bd6b026ef6ecb7f2fe15acaa40c608680dfff1;hp=59b5a2ce988026c0ab61225053d3b00376143196;hpb=1d47891cc3d43bc6b47e30d0b605436c3dac1fc9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/Revision/RevisionRendererTest.php b/tests/phpunit/includes/Revision/RevisionRendererTest.php
index 59b5a2ce98..d1418c28c8 100644
--- a/tests/phpunit/includes/Revision/RevisionRendererTest.php
+++ b/tests/phpunit/includes/Revision/RevisionRendererTest.php
@@ -19,7 +19,6 @@ use ParserOptions;
 use ParserOutput;
 use PHPUnit\Framework\MockObject\MockObject;
 use Title;
-use User;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
 use WikitextContent;
@@ -30,8 +29,8 @@ use WikitextContent;
 class RevisionRendererTest extends MediaWikiTestCase {
 
 	/**
-	 * @param $articleId
-	 * @param $revisionId
+	 * @param int $articleId
+	 * @param int $revisionId
 	 * @return Title
 	 */
 	private function getMockTitle( $articleId, $revisionId ) {
@@ -74,12 +73,8 @@ class RevisionRendererTest extends MediaWikiTestCase {
 				}
 			);
 		$mock->expects( $this->any() )
-			->method( 'userCan' )
-			->willReturnCallback(
-				function ( $perm, User $user ) use ( $mock ) {
-					return $user->isAllowed( $perm );
-				}
-			);
+			->method( 'getRestrictions' )
+			->willReturn( [] );
 
 		return $mock;
 	}
@@ -368,6 +363,7 @@ class RevisionRendererTest extends MediaWikiTestCase {
 		$sysop = $this->getTestUser( [ 'sysop' ] )->getUser(); // privileged!
 		$rr = $renderer->getRenderedRevision( $rev, $options, $sysop );
 
+		$this->assertNotNull( $rr, 'getRenderedRevision' );
 		$this->assertTrue( $rr->isContentDeleted(), 'isContentDeleted' );
 
 		$this->assertSame( $rev, $rr->getRevision() );