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

tests: Make PHPUnit data providers static

Browse source 
Initally used a new sniff with autofix (T333745)

Bug: T332865
Change-Id: I74e62a477cb8657da93180cd71432a95e70fff4b
This commit is contained in:
Umherirrender 2023-05-20 11:59:50 +02:00
parent 65470a1c77
commit 1a440848fa
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/phpunit/CaptchaPreAuthenticationProviderTest.php
View file

@ -71,7 +71,7 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
}
}
public function provideGetAuthenticationRequests() {
public static function provideGetAuthenticationRequests() {
return [
[ AuthManager::ACTION_LOGIN, null, [], false ],
[ AuthManager::ACTION_LOGIN, null, [ 'badlogin' ], false ],
@ -133,7 +133,7 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
$this->assertEquals( $result, $status->isGood() );
}
public function provideTestForAuthentication() {
public static function provideTestForAuthentication() {
$fallback = new UsernameAuthenticationRequest();
$fallback->username = 'Foo';
return [
@ -142,9 +142,9 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
'badlogin' => [ $fallback, true, false, false ],
'badloginperuser, no username' => [ null, false, true, true ],
'badloginperuser' => [ $fallback, false, true, false ],
'non-existent captcha' => [ $this->getCaptchaRequest( '123', '4' ), true, true, false ],
'wrong captcha' => [ $this->getCaptchaRequest( '345', '6' ), true, true, false ],
'correct captcha' => [ $this->getCaptchaRequest( '345', '4' ), true, true, true ],
'non-existent captcha' => [ self::getCaptchaRequest( '123', '4' ), true, true, false ],
'wrong captcha' => [ self::getCaptchaRequest( '345', '6' ), true, true, false ],
'correct captcha' => [ self::getCaptchaRequest( '345', '4' ), true, true, true ],
];
}
@ -166,15 +166,15 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
$this->assertEquals( $result, $status->isGood() );
}
public function provideTestForAccountCreation() {
public static function provideTestForAccountCreation() {
$user = User::newFromName( 'Bar' );
$sysop = User::newFromName( 'UTSysop' );
return [
// [ auth request, creator, result, disable trigger? ]
'no captcha' => [ null, $user, false ],
'non-existent captcha' => [ $this->getCaptchaRequest( '123', '4' ), $user, false ],
'wrong captcha' => [ $this->getCaptchaRequest( '345', '6' ), $user, false ],
'correct captcha' => [ $this->getCaptchaRequest( '345', '4' ), $user, true ],
'non-existent captcha' => [ self::getCaptchaRequest( '123', '4' ), $user, false ],
'wrong captcha' => [ self::getCaptchaRequest( '345', '6' ), $user, false ],
'correct captcha' => [ self::getCaptchaRequest( '345', '4' ), $user, true ],
'user is exempt' => [ null, $sysop, true ],
'disabled' => [ null, $user, true, 'disable' ],
];
@ -255,30 +255,30 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
}
}
public function providePingLimiter() {
public static function providePingLimiter() {
$sysop = User::newFromName( 'UTSysop' );
return [
// sequence of [ auth request, user, result, disable ping limiter? ]
'no failure' => [
[ $this->getCaptchaRequest( '345', '14' ), new User(), true ],
[ $this->getCaptchaRequest( '345', '14' ), new User(), true ],
[ self::getCaptchaRequest( '345', '14' ), new User(), true ],
[ self::getCaptchaRequest( '345', '14' ), new User(), true ],
],
'limited' => [
[ $this->getCaptchaRequest( '345', '33' ), new User(), false ],
[ $this->getCaptchaRequest( '345', '14' ), new User(), false ],
[ self::getCaptchaRequest( '345', '33' ), new User(), false ],
[ self::getCaptchaRequest( '345', '14' ), new User(), false ],
],
'exempt user' => [
[ $this->getCaptchaRequest( '345', '33' ), $sysop, false ],
[ $this->getCaptchaRequest( '345', '14' ), $sysop, true ],
[ self::getCaptchaRequest( '345', '33' ), $sysop, false ],
[ self::getCaptchaRequest( '345', '14' ), $sysop, true ],
],
'pinglimiter disabled' => [
[ $this->getCaptchaRequest( '345', '33' ), new User(), false, 'disable' ],
[ $this->getCaptchaRequest( '345', '14' ), new User(), true, 'disable' ],
[ self::getCaptchaRequest( '345', '33' ), new User(), false, 'disable' ],
[ self::getCaptchaRequest( '345', '14' ), new User(), true, 'disable' ],
],
];
}
protected function getCaptchaRequest( $id, $word, $username = null ) {
protected static function getCaptchaRequest( $id, $word, $username = null ) {
$req = new CaptchaAuthenticationRequest( $id, [ 'question' => '?', 'answer' => $word ] );
$req->captchaWord = $word;
$req->username = $username;

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

@ -31,7 +31,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expectedResult, $captcha->triggersCaptcha( $action ) );
}
public function provideSimpleTriggersCaptcha() {
public static function provideSimpleTriggersCaptcha() {
$data = [];
$captchaTriggers = new ReflectionClass( CaptchaTriggers::class );
$constants = $captchaTriggers->getConstants();
@ -61,7 +61,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expected, $captcha->triggersCaptcha( $trigger, $title ) );
}
public function provideNamespaceOverwrites() {
public static function provideNamespaceOverwrites() {
return [
[ 'edit', true ],
[ 'edit', false ],
@ -86,7 +86,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $value, $captcha->triggersCaptcha( $trigger ) );
}
public function provideAttributeSet() {
public static function provideAttributeSet() {
return [
[ 'test', true ],
[ 'test', false ],
@ -103,7 +103,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expected, $captcha->triggersCaptcha( $trigger ) );
}
public function provideAttributeOverwritten() {
public static function provideAttributeOverwritten() {
return [
[ 'edit', true ],
[ 'edit', false ],
@ -123,7 +123,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expected, $actual );
}
public function provideCanSkipCaptchaUserright() {
public static function provideCanSkipCaptchaUserright() {
return [
[ true, true ],
[ false, false ]
@ -146,7 +146,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expected, $actual );
}
public function provideCanSkipCaptchaMailconfirmed() {
public static function provideCanSkipCaptchaMailconfirmed() {
return [
[ false, false, false ],
[ false, true, false ],
@ -174,7 +174,7 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( $expected, $actual );
}
public function provideCanSkipCaptchaIPWhitelisted() {
public static function provideCanSkipCaptchaIPWhitelisted() {
return ( [
[ '127.0.0.1', [ '127.0.0.1', '127.0.0.2' ], true ],
[ '127.0.0.1', [], false ]