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

Fix test hooking of 'PingLimiter'

Browse source 
The code was setting $wgHooks['PingLimiter'] to a Closure rather than
an array of callables, which resulted in the hook never actually being
called.

Interesting that that didn't make any of the tests fail. Anyway, let's
switch to using the setTemporaryHook() method now provided by MW's base
test class.

Change-Id: I6ac22b3c43735dcab4920de827bf06e25f9adc04
This commit is contained in:
Brad Jorsch 2020-04-02 15:19:22 -04:00
parent 356b64e3d7
commit 003237ce9c
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/phpunit/CaptchaPreAuthenticationProviderTest.php
View file

@ -101,7 +101,7 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiTestCase {
public function testTestForAuthentication( $req, $isBadLoginTriggered,
$isBadLoginPerUserTriggered, $result
) {
$this->setMwHook( 'PingLimiter', function ( $user, $action, &$result ) {
$this->setTemporaryHook( 'PingLimiter', function ( $user, $action, &$result ) {
$result = false;
return false;
} );
@ -141,7 +141,7 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiTestCase {
* @dataProvider provideTestForAccountCreation
*/
public function testTestForAccountCreation( $req, $creator, $result, $disableTrigger = false ) {
$this->setMwHook( 'PingLimiter', function ( $user, $action, &$result ) {
$this->setTemporaryHook( 'PingLimiter', function ( $user, $action, &$result ) {
$result = false;
return false;
} );
@ -225,17 +225,18 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiTestCase {
$provider->setManager( AuthManager::singleton() );
$providerAccess = TestingAccessWrapper::newFromObject( $provider );
foreach ( $attempts as $attempt ) {
if ( !empty( $attempts[3] ) ) {
$this->setMwHook( 'PingLimiter', function ( &$user, $action, &$result ) {
$disablePingLimiter = false;
$this->setTemporaryHook( 'PingLimiter',
function ( &$user, $action, &$result ) use ( &$disablePingLimiter ) {
if ( $disablePingLimiter ) {
$result = false;
return false;
} );
} else {
$this->setMwHook( 'PingLimiter', function () {
} );
}
return null;
}
);
foreach ( $attempts as $attempt ) {
$disablePingLimiter = !empty( $attempts[3] );
$captcha = new SimpleCaptcha();
CaptchaStore::get()->store( '345', [ 'question' => '7+7', 'answer' => '14' ] );
$success = $providerAccess->verifyCaptcha( $captcha, [ $attempts[0] ], $attempts[1] );
@ -292,13 +293,4 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiTestCase {
$this->setMwGlobals( 'wgCaptchaTriggers', $captchaTriggers );
}
/**
* Set a $wgHooks handler for a given hook and remove all other handlers (though not ones
* set via Hooks::register). The original state will be restored after the test.
* @param string $hook Hook name
* @param callable $callback Hook method
*/
protected function setMwHook( $hook, callable $callback ) {
$this->mergeMwGlobalArrayValue( 'wgHooks', [ $hook => $callback ] );
}
}