jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390425 )
Change subject: Tests for Revision::userCan ...................................................................... Tests for Revision::userCan Bug: T180210 Change-Id: I22f214dab6cba856982c566462562a137181d9cc --- M tests/phpunit/includes/RevisionDbTestBase.php 1 file changed, 44 insertions(+), 0 deletions(-) Approvals: Daniel Kinzler: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php index f5a3c10..5e8b0c8 100644 --- a/tests/phpunit/includes/RevisionDbTestBase.php +++ b/tests/phpunit/includes/RevisionDbTestBase.php @@ -1304,4 +1304,48 @@ ); } + public function provideUserCan() { + yield [ 0, 0, [], true ]; + // Bitfields match, user has no permissions + yield [ Revision::DELETED_TEXT, Revision::DELETED_TEXT, [], false ]; + yield [ Revision::DELETED_COMMENT, Revision::DELETED_COMMENT, [], false ]; + yield [ Revision::DELETED_USER, Revision::DELETED_USER, [], false ]; + yield [ Revision::DELETED_RESTRICTED, Revision::DELETED_RESTRICTED, [], false ]; + // Bitfields match, user (admin) does have permissions + yield [ Revision::DELETED_TEXT, Revision::DELETED_TEXT, [ 'sysop' ], true ]; + yield [ Revision::DELETED_COMMENT, Revision::DELETED_COMMENT, [ 'sysop' ], true ]; + yield [ Revision::DELETED_USER, Revision::DELETED_USER, [ 'sysop' ], true ]; + // Bitfields match, user (admin) does not have permissions + yield [ Revision::DELETED_RESTRICTED, Revision::DELETED_RESTRICTED, [ 'sysop' ], false ]; + // Bitfields match, user (oversight) does have permissions + yield [ Revision::DELETED_RESTRICTED, Revision::DELETED_RESTRICTED, [ 'oversight' ], true ]; + } + + /** + * @dataProvider provideUserCan + * @covers Revision::userCan + */ + public function testUserCan( $bitField, $field, $userGroups, $expected ) { + $this->setMwGlobals( + 'wgGroupPermissions', + [ + 'sysop' => [ + 'deletedtext' => true, + 'deletedhistory' => true, + ], + 'oversight' => [ + 'viewsuppressed' => true, + 'suppressrevision' => true, + ], + ] + ); + $user = $this->getTestUser( $userGroups )->getUser(); + $revision = new Revision( [ 'deleted' => $bitField ] ); + + $this->assertSame( + $expected, + $revision->userCan( $field, $user ) + ); + } + } -- To view, visit https://gerrit.wikimedia.org/r/390425 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I22f214dab6cba856982c566462562a137181d9cc Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits