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

diff --git a/tests/phpunit/includes/Revision/RevisionRendererTest.php b/tests/phpunit/includes/Revision/RevisionRendererTest.php
index d57625b510..d1418c28c8 100644
--- a/tests/phpunit/includes/Revision/RevisionRendererTest.php
+++ b/tests/phpunit/includes/Revision/RevisionRendererTest.php
@@ -6,7 +6,6 @@ use CommentStoreComment;
 use Content;
 use Language;
 use LogicException;
-use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\MainSlotRoleHandler;
 use MediaWiki\Revision\RevisionRecord;
@@ -20,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,20 +28,6 @@ use WikitextContent;
  */
 class RevisionRendererTest extends MediaWikiTestCase {
 
-	/** @var PermissionManager|\PHPUnit_Framework_MockObject_MockObject $permissionManagerMock */
-	private $permissionManagerMock;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->permissionManagerMock = $this->createMock( PermissionManager::class );
-		$this->overrideMwServices( null, [
-			'PermissionManager' => function (): PermissionManager {
-				return $this->permissionManagerMock;
-			}
-		] );
-	}
-
 	/**
 	 * @param int $articleId
 	 * @param int $revisionId
@@ -88,13 +72,9 @@ class RevisionRendererTest extends MediaWikiTestCase {
 					return $mock->getArticleID() === $other->getArticleID();
 				}
 			);
-		$this->permissionManagerMock->expects( $this->any() )
-			->method( 'userCan' )
-			->willReturnCallback(
-				function ( $perm, User $user ) {
-					return $user->isAllowed( $perm );
-				}
-			);
+		$mock->expects( $this->any() )
+			->method( 'getRestrictions' )
+			->willReturn( [] );
 
 		return $mock;
 	}
@@ -383,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() );