mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/ConfirmEdit
synced 2024-09-23 10:22:37 +00:00
Merge "Fix confusing usages of TestingAccessWrapper"
This commit is contained in:
commit
31c26eaa77
|
@ -36,8 +36,10 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
|
||||||
|
|
||||||
public function tearDown(): void {
|
public function tearDown(): void {
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
/** @var Hooks $req */
|
||||||
|
$req = TestingAccessWrapper::newFromClass( Hooks::class );
|
||||||
// make sure $wgCaptcha resets between tests
|
// make sure $wgCaptcha resets between tests
|
||||||
TestingAccessWrapper::newFromClass( Hooks::class )->instanceCreated = false;
|
$req->instanceCreated = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -102,10 +104,12 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
|
||||||
[ 'username' => 'Foo' ] );
|
[ 'username' => 'Foo' ] );
|
||||||
|
|
||||||
$this->assertCount( 1, $reqs );
|
$this->assertCount( 1, $reqs );
|
||||||
$this->assertInstanceOf( CaptchaAuthenticationRequest::class, $reqs[0] );
|
/** @var CaptchaAuthenticationRequest $req */
|
||||||
|
$req = $reqs[0];
|
||||||
|
$this->assertInstanceOf( CaptchaAuthenticationRequest::class, $req );
|
||||||
|
|
||||||
$id = $reqs[0]->captchaId;
|
$id = $req->captchaId;
|
||||||
$data = TestingAccessWrapper::newFromObject( $reqs[0] )->captchaData;
|
$data = $req->captchaData;
|
||||||
$this->assertEquals( $captcha->retrieveCaptcha( $id ), $data + [ 'index' => $id ] );
|
$this->assertEquals( $captcha->retrieveCaptcha( $id ), $data + [ 'index' => $id ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,6 +245,7 @@ class CaptchaPreAuthenticationProviderTest extends MediaWikiIntegrationTestCase
|
||||||
);
|
);
|
||||||
$provider = new CaptchaPreAuthenticationProvider();
|
$provider = new CaptchaPreAuthenticationProvider();
|
||||||
$this->initProvider( $provider, null, null, $this->getServiceContainer()->getAuthManager() );
|
$this->initProvider( $provider, null, null, $this->getServiceContainer()->getAuthManager() );
|
||||||
|
/** @var CaptchaPreAuthenticationProvider $providerAccess */
|
||||||
$providerAccess = TestingAccessWrapper::newFromObject( $provider );
|
$providerAccess = TestingAccessWrapper::newFromObject( $provider );
|
||||||
|
|
||||||
$disablePingLimiter = false;
|
$disablePingLimiter = false;
|
||||||
|
|
|
@ -170,10 +170,10 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
|
||||||
'edit' => true,
|
'edit' => true,
|
||||||
] );
|
] );
|
||||||
$testObject = new SimpleCaptcha();
|
$testObject = new SimpleCaptcha();
|
||||||
/** @var SimpleCaptcha|TestingAccessWrapper $wrapper */
|
/** @var SimpleCaptcha $wrapper */
|
||||||
$wrapper = TestingAccessWrapper::newFromObject( $testObject );
|
$wrapper = TestingAccessWrapper::newFromObject( $testObject );
|
||||||
$wrapper->captchaSolved = true;
|
$wrapper->captchaSolved = true;
|
||||||
$this->assertFalse( $wrapper->triggersCaptcha( 'edit' ), 'CAPTCHA is not triggered if already solved' );
|
$this->assertFalse( $testObject->triggersCaptcha( 'edit' ), 'CAPTCHA is not triggered if already solved' );
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testForceShowCaptcha() {
|
public function testForceShowCaptcha() {
|
||||||
|
@ -181,12 +181,10 @@ class CaptchaTest extends MediaWikiIntegrationTestCase {
|
||||||
'edit' => false,
|
'edit' => false,
|
||||||
] );
|
] );
|
||||||
$testObject = new SimpleCaptcha();
|
$testObject = new SimpleCaptcha();
|
||||||
/** @var SimpleCaptcha|TestingAccessWrapper $wrapper */
|
|
||||||
$wrapper = TestingAccessWrapper::newFromObject( $testObject );
|
|
||||||
$this->assertFalse(
|
$this->assertFalse(
|
||||||
$wrapper->triggersCaptcha( 'edit' ), 'CAPTCHA is not triggered by edit action in this configuration'
|
$testObject->triggersCaptcha( 'edit' ), 'CAPTCHA is not triggered by edit action in this configuration'
|
||||||
);
|
);
|
||||||
$wrapper->setForceShowCaptcha( true );
|
$testObject->setForceShowCaptcha( true );
|
||||||
$this->assertTrue( $wrapper->triggersCaptcha( 'edit' ), 'Force showing a CAPTCHA if flag is set' );
|
$this->assertTrue( $testObject->triggersCaptcha( 'edit' ), 'Force showing a CAPTCHA if flag is set' );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue