}
$user->clearInstanceCache();
- $this->assertEquals( 3, $user->getEditCount(), 'After three edits, the user edit count should be 3' );
+ $this->assertEquals(
+ 3,
+ $user->getEditCount(),
+ 'After three edits, the user edit count should be 3'
+ );
// increase the edit count and clear the cache
$user->incEditCount();
$user->clearInstanceCache();
- $this->assertEquals( 4, $user->getEditCount(), 'After increasing the edit count manually, the user edit count should be 4' );
+ $this->assertEquals(
+ 4,
+ $user->getEditCount(),
+ 'After increasing the edit count manually, the user edit count should be 4'
+ );
}
/**
}
/**
- * Helper, fetch user properties from the database.
- * @param int $userId
+ * Test password expiration.
+ * @covers User::getPasswordExpired()
*/
- function dbUserProperties( $userId ) {
- $res = wfGetDB( DB_SLAVE )->select(
- 'user_properties',
- array( 'up_property', 'up_value' ),
- array( 'up_user' => $userId ),
- __METHOD__
- );
- $ret = array();
- foreach( $res as $row ) {
- $ret[$row->up_property] = $row->up_value;
- }
- return $ret;
- }
-
- public function testOnlySaveChangedOptions() {
- $user = User::newFromName( 'UnitTestUser2' );
- $user->addToDatabase();
+ public function testPasswordExpire() {
+ global $wgPasswordExpireGrace;
+ $wgTemp = $wgPasswordExpireGrace;
+ $wgPasswordExpireGrace = 3600 * 24 * 7; // 7 days
- // Fresh user only has default, so nothing should be in the DB
- $dbProps = $this->dbUserProperties( $user->getId() );
- $this->assertEmpty( $dbProps,
- "A new user should not have any user property saved in the DB" );
+ $user = User::newFromName( 'UnitTestUser' );
+ $user->loadDefaults();
+ $this->assertEquals( false, $user->getPasswordExpired() );
- // Make sure we only save the altered option
- $user->setOption( 'changed_opt', 'alix_20281' );
- $user->setOption( 'switch', 1 );
- $user->setOption( 'anotherswitch', 1 );
- $user->saveSettings();
+ $ts = time() - ( 3600 * 24 * 1 ); // 1 day ago
+ $user->expirePassword( $ts );
+ $this->assertEquals( 'soft', $user->getPasswordExpired() );
- $expected = array (
- 'changed_opt' => 'alix_20281',
- 'switch' => '1',
- 'anotherswitch' => '1',
- );
- $dbProps = $this->dbUserProperties( $user->getId() );
+ $ts = time() - ( 3600 * 24 * 10 ); // 10 days ago
+ $user->expirePassword( $ts );
+ $this->assertEquals( 'hard', $user->getPasswordExpired() );
- $this->assertEquals( $expected, $dbProps,
- "non default options should be saved, and default ones should not" );
+ $wgPasswordExpireGrace = $wgTemp;
+ }
+ /**
+ * Test password validity checks. There are 3 checks in core,
+ * - ensure the password meets the minimal length
+ * - ensure the password is not the same as the username
+ * - ensure the username/password combo isn't forbidden
+ * @covers User::checkPasswordValidity()
+ * @covers User::getPasswordValidity()
+ * @covers User::isValidPassword()
+ */
+ public function testCheckPasswordValidity() {
+ $this->setMwGlobals( 'wgMinimalPasswordLength', 6 );
+ $user = User::newFromName( 'Useruser' );
+ // Sanity
+ $this->assertTrue( $user->isValidPassword( 'Password1234' ) );
+
+ // Minimum length
+ $this->assertFalse( $user->isValidPassword( 'a' ) );
+ $this->assertFalse( $user->checkPasswordValidity( 'a' )->isGood() );
+ $this->assertEquals( 'passwordtooshort', $user->getPasswordValidity( 'a' ) );
+
+ // Matches username
+ $this->assertFalse( $user->checkPasswordValidity( 'Useruser' )->isGood() );
+ $this->assertEquals( 'password-name-match', $user->getPasswordValidity( 'Useruser' ) );
+
+ // On the forbidden list
+ $this->assertFalse( $user->checkPasswordValidity( 'Passpass' )->isGood() );
+ $this->assertEquals( 'password-login-forbidden', $user->getPasswordValidity( 'Passpass' ) );
}
}