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 "CategoryPager: Allow categories with no members to be shown"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
auth
/
LocalPasswordPrimaryAuthenticationProviderTest.php
diff --git
a/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
b/tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
index
caf1680
..
72a03c3
100644
(file)
--- a/
tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
+++ b/
tests/phpunit/includes/auth/LocalPasswordPrimaryAuthenticationProviderTest.php
@@
-2,6
+2,8
@@
namespace MediaWiki\Auth;
namespace MediaWiki\Auth;
+use MediaWiki\MediaWikiServices;
+
/**
* @group AuthManager
* @group Database
/**
* @group AuthManager
* @group Database
@@
-28,7
+30,7
@@
class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase
}
$config = new \MultiConfig( [
$this->config,
}
$config = new \MultiConfig( [
$this->config,
-
\ConfigFactory::getDefaultInstance()->makeConfig( 'main'
)
+
MediaWikiServices::getInstance()->getMainConfig(
)
] );
if ( !$this->manager ) {
] );
if ( !$this->manager ) {
@@
-449,7
+451,7
@@
class LocalPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestCase
$changeReq->password = $newpass;
$provider->providerChangeAuthenticationData( $changeReq );
$changeReq->password = $newpass;
$provider->providerChangeAuthenticationData( $changeReq );
- if ( $loginOnly ) {
+ if ( $loginOnly
&& $changed
) {
$old = 'fail';
$new = 'fail';
$expectExpiry = null;
$old = 'fail';
$new = 'fail';
$expectExpiry = null;