dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace $wgUser with RequestContext::getUser in User::getBlockedStatus
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
auth
/
CheckBlocksSecondaryAuthenticationProviderTest.php
diff --git
a/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php
index
f2341bc
..
e8b61c5
100644
(file)
--- a/
tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php
+++ b/
tests/phpunit/includes/auth/CheckBlocksSecondaryAuthenticationProviderTest.php
@@
-2,24
+2,17
@@
namespace MediaWiki\Auth;
namespace MediaWiki\Auth;
+use Wikimedia\TestingAccessWrapper;
+
/**
* @group AuthManager
* @group Database
* @covers MediaWiki\Auth\CheckBlocksSecondaryAuthenticationProvider
*/
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase {
/**
* @group AuthManager
* @group Database
* @covers MediaWiki\Auth\CheckBlocksSecondaryAuthenticationProvider
*/
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase {
- protected function setUp() {
- global $wgDisableAuthManager;
-
- parent::setUp();
- if ( $wgDisableAuthManager ) {
- $this->markTestSkipped( '$wgDisableAuthManager is set' );
- }
- }
-
public function testConstructor() {
$provider = new CheckBlocksSecondaryAuthenticationProvider();
public function testConstructor() {
$provider = new CheckBlocksSecondaryAuthenticationProvider();
- $providerPriv =
\
TestingAccessWrapper::newFromObject( $provider );
+ $providerPriv = TestingAccessWrapper::newFromObject( $provider );
$config = new \HashConfig( [
'BlockDisablesLogin' => false
] );
$config = new \HashConfig( [
'BlockDisablesLogin' => false
] );
@@
-29,7
+22,7
@@
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$provider = new CheckBlocksSecondaryAuthenticationProvider(
[ 'blockDisablesLogin' => true ]
);
$provider = new CheckBlocksSecondaryAuthenticationProvider(
[ 'blockDisablesLogin' => true ]
);
- $providerPriv =
\
TestingAccessWrapper::newFromObject( $provider );
+ $providerPriv = TestingAccessWrapper::newFromObject( $provider );
$config = new \HashConfig( [
'BlockDisablesLogin' => false
] );
$config = new \HashConfig( [
'BlockDisablesLogin' => false
] );
@@
-83,6
+76,7
@@
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$blockOptions = [
'address' => 'UTBlockee',
'user' => $user->getID(),
$blockOptions = [
'address' => 'UTBlockee',
'user' => $user->getID(),
+ 'by' => $this->getTestSysop()->getUser()->getId(),
'reason' => __METHOD__,
'expiry' => time() + 100500,
'createAccount' => true,
'reason' => __METHOD__,
'expiry' => time() + 100500,
'createAccount' => true,
@@
-142,12
+136,12
@@
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
);
$status = $provider->testUserForCreation( $blockedUser, AuthManager::AUTOCREATE_SOURCE_SESSION );
);
$status = $provider->testUserForCreation( $blockedUser, AuthManager::AUTOCREATE_SOURCE_SESSION );
- $this->assertInstanceOf(
'StatusValue'
, $status );
+ $this->assertInstanceOf(
\StatusValue::class
, $status );
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-text' ) );
$status = $provider->testUserForCreation( $blockedUser, false );
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-text' ) );
$status = $provider->testUserForCreation( $blockedUser, false );
- $this->assertInstanceOf(
'StatusValue'
, $status );
+ $this->assertInstanceOf(
\StatusValue::class
, $status );
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-text' ) );
}
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-text' ) );
}
@@
-156,12
+150,13
@@
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$blockOptions = [
'address' => '127.0.0.0/24',
'reason' => __METHOD__,
$blockOptions = [
'address' => '127.0.0.0/24',
'reason' => __METHOD__,
+ 'by' => $this->getTestSysop()->getUser()->getId(),
'expiry' => time() + 100500,
'createAccount' => true,
];
$block = new \Block( $blockOptions );
$block->insert();
'expiry' => time() + 100500,
'createAccount' => true,
];
$block = new \Block( $blockOptions );
$block->insert();
- $scopeVariable = new \ScopedCallback( [ $block, 'delete' ] );
+ $scopeVariable = new \
Wikimedia\
ScopedCallback( [ $block, 'delete' ] );
$user = \User::newFromName( 'UTNormalUser' );
if ( $user->getID() == 0 ) {
$user = \User::newFromName( 'UTNormalUser' );
if ( $user->getID() == 0 ) {
@@
-170,6
+165,7
@@
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$user->saveSettings();
}
$this->setMwGlobals( [ 'wgUser' => $user ] );
$user->saveSettings();
}
$this->setMwGlobals( [ 'wgUser' => $user ] );
+ \RequestContext::getMain()->setUser( $user );
$newuser = \User::newFromName( 'RandomUser' );
$provider = new CheckBlocksSecondaryAuthenticationProvider(
$newuser = \User::newFromName( 'RandomUser' );
$provider = new CheckBlocksSecondaryAuthenticationProvider(
@@
-183,12
+179,12
@@
class CheckBlocksSecondaryAuthenticationProviderTest extends \MediaWikiTestCase
$this->assertEquals( AuthenticationResponse::FAIL, $ret->status );
$status = $provider->testUserForCreation( $newuser, AuthManager::AUTOCREATE_SOURCE_SESSION );
$this->assertEquals( AuthenticationResponse::FAIL, $ret->status );
$status = $provider->testUserForCreation( $newuser, AuthManager::AUTOCREATE_SOURCE_SESSION );
- $this->assertInstanceOf(
'StatusValue'
, $status );
+ $this->assertInstanceOf(
\StatusValue::class
, $status );
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-range-text' ) );
$status = $provider->testUserForCreation( $newuser, false );
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-range-text' ) );
$status = $provider->testUserForCreation( $newuser, false );
- $this->assertInstanceOf(
'StatusValue'
, $status );
+ $this->assertInstanceOf(
\StatusValue::class
, $status );
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-range-text' ) );
}
$this->assertFalse( $status->isOK() );
$this->assertTrue( $status->hasMessage( 'cantcreateaccount-range-text' ) );
}