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 "Revert "Log the reason why revision->getContent() returns null""
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
password
/
UserPasswordPolicyTest.php
diff --git
a/tests/phpunit/includes/password/UserPasswordPolicyTest.php
b/tests/phpunit/includes/password/UserPasswordPolicyTest.php
index
8a69b5c
..
78175fa
100644
(file)
--- a/
tests/phpunit/includes/password/UserPasswordPolicyTest.php
+++ b/
tests/phpunit/includes/password/UserPasswordPolicyTest.php
@@
-22,9
+22,12
@@
/**
* @group Database
/**
* @group Database
+ * @covers UserPasswordPolicy
*/
class UserPasswordPolicyTest extends MediaWikiTestCase {
*/
class UserPasswordPolicyTest extends MediaWikiTestCase {
+ protected $tablesUsed = [ 'user', 'user_groups' ];
+
protected $policies = [
'checkuser' => [
'MinimalPasswordLength' => 10,
protected $policies = [
'checkuser' => [
'MinimalPasswordLength' => 10,
@@
-56,11
+59,7
@@
class UserPasswordPolicyTest extends MediaWikiTestCase {
return new UserPasswordPolicy( $this->policies, $this->checks );
}
return new UserPasswordPolicy( $this->policies, $this->checks );
}
- /**
- * @covers UserPasswordPolicy::getPoliciesForUser
- */
public function testGetPoliciesForUser() {
public function testGetPoliciesForUser() {
-
$upp = $this->getUserPasswordPolicy();
$user = User::newFromName( 'TestUserPolicy' );
$upp = $this->getUserPasswordPolicy();
$user = User::newFromName( 'TestUserPolicy' );
@@
-79,9
+78,6
@@
class UserPasswordPolicyTest extends MediaWikiTestCase {
);
}
);
}
- /**
- * @covers UserPasswordPolicy::getPoliciesForGroups
- */
public function testGetPoliciesForGroups() {
$effective = UserPasswordPolicy::getPoliciesForGroups(
$this->policies,
public function testGetPoliciesForGroups() {
$effective = UserPasswordPolicy::getPoliciesForGroups(
$this->policies,
@@
-103,10
+99,8
@@
class UserPasswordPolicyTest extends MediaWikiTestCase {
/**
* @dataProvider provideCheckUserPassword
/**
* @dataProvider provideCheckUserPassword
- * @covers UserPasswordPolicy::checkUserPassword
*/
public function testCheckUserPassword( $username, $groups, $password, $valid, $ok, $msg ) {
*/
public function testCheckUserPassword( $username, $groups, $password, $valid, $ok, $msg ) {
-
$upp = $this->getUserPasswordPolicy();
$user = User::newFromName( $username );
$upp = $this->getUserPasswordPolicy();
$user = User::newFromName( $username );
@@
-183,7
+177,6
@@
class UserPasswordPolicyTest extends MediaWikiTestCase {
/**
* @dataProvider provideMaxOfPolicies
/**
* @dataProvider provideMaxOfPolicies
- * @covers UserPasswordPolicy::maxOfPolicies
*/
public function testMaxOfPolicies( $p1, $p2, $max, $msg ) {
$this->assertArrayEquals(
*/
public function testMaxOfPolicies( $p1, $p2, $max, $msg ) {
$this->assertArrayEquals(