wikimedia/mediawiki-extensions-ConfirmEdit
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit synced 2024-11-24 00:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge trivial @dataProviders in CaptchaTest

Browse source 
These providers don't really do anything but provide the two possible
booleans. That's it. Why not make the code say that?

Change-Id: I0cbca6222e8130d504494ae86b1a963a92430a61
This commit is contained in:
thiemowmde 2024-09-13 13:02:24 +02:00
parent 5a86fd08ff
commit 9639f30ed5
1 changed files with 15 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
tests/phpunit/SimpleCaptcha/CaptchaTest.php
View file

@ -47,9 +47,10 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
}
/**
* @dataProvider provideNamespaceOverwrites
* @dataProvider provideBooleans
*/
public function testNamespaceTriggersOverwrite( $trigger, $expected ) {
public function testNamespaceTriggersOverwrite( bool $expected ) {
$trigger = 'edit';
$captcha = new SimpleCaptcha();
$this->overrideConfigValues( [
'CaptchaTriggers' => [
@ -65,13 +66,6 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expected, $captcha->triggersCaptcha( $trigger, $title ) );
}
public static function provideNamespaceOverwrites() {
return [
[ 'edit', true ],
[ 'edit', false ],
];
}
private function setCaptchaTriggersAttribute( $trigger, $value ) {
// Avoid clobbering captcha triggers registered by other extensions
$this->overrideConfigValue( 'CaptchaTriggers', $GLOBALS['wgCaptchaTriggers'] );
@ -82,56 +76,42 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
}
/**
* @dataProvider provideAttributeSet
* @dataProvider provideBooleans
*/
public function testCaptchaTriggersAttributeSetTrue( $trigger, $value ) {
public function testCaptchaTriggersAttributeSetTrue( bool $value ) {
$trigger = 'test';
$this->setCaptchaTriggersAttribute( $trigger, $value );
$captcha = new SimpleCaptcha();
$this->assertEquals( $value, $captcha->triggersCaptcha( $trigger ) );
}
public static function provideAttributeSet() {
return [
[ 'test', true ],
[ 'test', false ],
];
}
/**
* @dataProvider provideAttributeOverwritten
* @dataProvider provideBooleans
*/
public function testCaptchaTriggersAttributeGetsOverwritten( $trigger, $expected ) {
public function testCaptchaTriggersAttributeGetsOverwritten( bool $expected ) {
$trigger = 'edit';
$this->overrideConfigValue( 'CaptchaTriggers', [ $trigger => $expected ] );
$this->setCaptchaTriggersAttribute( $trigger, !$expected );
$captcha = new SimpleCaptcha();
$this->assertEquals( $expected, $captcha->triggersCaptcha( $trigger ) );
}
public static function provideAttributeOverwritten() {
return [
[ 'edit', true ],
[ 'edit', false ],
];
}
/**
* @dataProvider provideCanSkipCaptchaUserright
* @dataProvider provideBooleans
*/
public function testCanSkipCaptchaUserright( $userIsAllowed, $expected ) {
public function testCanSkipCaptchaUserright( bool $userIsAllowed ) {
$testObject = new SimpleCaptcha();
$user = $this->createMock( User::class );
$user->method( 'isAllowed' )->willReturn( $userIsAllowed );
$actual = $testObject->canSkipCaptcha( $user, RequestContext::getMain()->getConfig() );
$this->assertEquals( $expected, $actual );
$this->assertEquals( $userIsAllowed, $actual );
}
public static function provideCanSkipCaptchaUserright() {
return [
[ true, true ],
[ false, false ]
];
public static function provideBooleans() {
yield [ true ];
yield [ false ];
}
/**