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
Merge "HTMLFormFieldCloner: Don't try to validate hidden fields"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
auth
/
LegacyHookPreAuthenticationProviderTest.php
diff --git
a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php
index
3548002
..
b96455e
100644
(file)
--- a/
tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php
+++ b/
tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php
@@
-2,21
+2,14
@@
namespace MediaWiki\Auth;
namespace MediaWiki\Auth;
+use MediaWiki\MediaWikiServices;
+
/**
* @group AuthManager
* @group Database
* @covers MediaWiki\Auth\LegacyHookPreAuthenticationProvider
*/
class LegacyHookPreAuthenticationProviderTest extends \MediaWikiTestCase {
/**
* @group AuthManager
* @group Database
* @covers MediaWiki\Auth\LegacyHookPreAuthenticationProvider
*/
class LegacyHookPreAuthenticationProviderTest extends \MediaWikiTestCase {
- protected function setUp() {
- global $wgDisableAuthManager;
-
- parent::setUp();
- if ( $wgDisableAuthManager ) {
- $this->markTestSkipped( '$wgDisableAuthManager is set' );
- }
- }
-
/**
* Get an instance of the provider
* @return LegacyHookPreAuthenticationProvider
/**
* Get an instance of the provider
* @return LegacyHookPreAuthenticationProvider
@@
-26,7
+19,8
@@
class LegacyHookPreAuthenticationProviderTest extends \MediaWikiTestCase {
$request->expects( $this->any() )->method( 'getIP' )->will( $this->returnValue( '127.0.0.42' ) );
$manager = new AuthManager(
$request->expects( $this->any() )->method( 'getIP' )->will( $this->returnValue( '127.0.0.42' ) );
$manager = new AuthManager(
- $request, \ConfigFactory::getDefaultInstance()->makeConfig( 'main' )
+ $request,
+ MediaWikiServices::getInstance()->getMainConfig()
);
$provider = new LegacyHookPreAuthenticationProvider();
);
$provider = new LegacyHookPreAuthenticationProvider();