jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/390424 )
Change subject: Tests for Revision::userCanBitfield ...................................................................... Tests for Revision::userCanBitfield Bug: T180210 Change-Id: Idf7e9d0f05b967b2fc083e6a70e9411b53390ed7 --- M tests/phpunit/includes/RevisionDbTestBase.php 1 file changed, 58 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 1149307..f5a3c10 100644 --- a/tests/phpunit/includes/RevisionDbTestBase.php +++ b/tests/phpunit/includes/RevisionDbTestBase.php @@ -1246,4 +1246,62 @@ $this->assertRevEquals( $rev, $cache->get( $key ) ); } + public function provideUserCanBitfield() { + yield [ 0, 0, [], null, true ]; + // Bitfields match, user has no permissions + yield [ Revision::DELETED_TEXT, Revision::DELETED_TEXT, [], null, false ]; + yield [ Revision::DELETED_COMMENT, Revision::DELETED_COMMENT, [], null, false ]; + yield [ Revision::DELETED_USER, Revision::DELETED_USER, [], null, false ]; + yield [ Revision::DELETED_RESTRICTED, Revision::DELETED_RESTRICTED, [], null, false ]; + // Bitfields match, user (admin) does have permissions + yield [ Revision::DELETED_TEXT, Revision::DELETED_TEXT, [ 'sysop' ], null, true ]; + yield [ Revision::DELETED_COMMENT, Revision::DELETED_COMMENT, [ 'sysop' ], null, true ]; + yield [ Revision::DELETED_USER, Revision::DELETED_USER, [ 'sysop' ], null, true ]; + // Bitfields match, user (admin) does not have permissions + yield [ Revision::DELETED_RESTRICTED, Revision::DELETED_RESTRICTED, [ 'sysop' ], null, false ]; + // Bitfields match, user (oversight) does have permissions + yield [ Revision::DELETED_RESTRICTED, Revision::DELETED_RESTRICTED, [ 'oversight' ], null, true ]; + // Check permissions using the title + yield [ + Revision::DELETED_TEXT, + Revision::DELETED_TEXT, + [ 'sysop' ], + Title::newFromText( __METHOD__ ), + true, + ]; + yield [ + Revision::DELETED_TEXT, + Revision::DELETED_TEXT, + [], + Title::newFromText( __METHOD__ ), + false, + ]; + } + + /** + * @dataProvider provideUserCanBitfield + * @covers Revision::userCanBitfield + */ + public function testUserCanBitfield( $bitField, $field, $userGroups, $title, $expected ) { + $this->setMwGlobals( + 'wgGroupPermissions', + [ + 'sysop' => [ + 'deletedtext' => true, + 'deletedhistory' => true, + ], + 'oversight' => [ + 'viewsuppressed' => true, + 'suppressrevision' => true, + ], + ] + ); + $user = $this->getTestUser( $userGroups )->getUser(); + + $this->assertSame( + $expected, + Revision::userCanBitfield( $bitField, $field, $user, $title ) + ); + } + } -- To view, visit https://gerrit.wikimedia.org/r/390424 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf7e9d0f05b967b2fc083e6a70e9411b53390ed7 Gerrit-PatchSet: 2 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