[ticket/12183] Test that login with old password doesn't work after reset

PHPBB3-12183
This commit is contained in:
Marc Alexander 2014-02-17 23:43:53 +01:00
parent f1c913f176
commit c82967d92b

View file

@ -54,17 +54,17 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
public function data_activate_new_password() public function data_activate_new_password()
{ {
return array( return array(
array('WRONG_ACTIVATION', false, 'FOOBAR', false), array('WRONG_ACTIVATION', false, 'FOOBAR'),
array('ALREADY_ACTIVATED', 2, 'FOOBAR', false), array('ALREADY_ACTIVATED', 2, 'FOOBAR'),
array('PASSWORD_ACTIVATED', false, false, true), array('PASSWORD_ACTIVATED', false, false),
array('ALREADY_ACTIVATED', false, false, false), array('ALREADY_ACTIVATED', false, false),
); );
} }
/** /**
* @dataProvider data_activate_new_password * @dataProvider data_activate_new_password
*/ */
public function test_activate_new_password($expected, $user_id, $act_key, $login_with_newpasswd) public function test_activate_new_password($expected, $user_id, $act_key)
{ {
$this->add_lang('ucp'); $this->add_lang('ucp');
$this->get_user_data(); $this->get_user_data();
@ -73,19 +73,40 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca
$crawler = self::request('GET', "ucp.php?mode=activate&u=$user_id&k=$act_key&sid={$this->sid}"); $crawler = self::request('GET', "ucp.php?mode=activate&u=$user_id&k=$act_key&sid={$this->sid}");
$this->assertContainsLang($expected, $crawler->text()); $this->assertContainsLang($expected, $crawler->text());
}
// Can't use login method here public function test_login()
if ($login_with_newpasswd)
{ {
$this->add_lang('ucp');
$crawler = self::request('GET', 'ucp.php'); $crawler = self::request('GET', 'ucp.php');
$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); $this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
$form = $crawler->selectButton($this->lang('LOGIN'))->form(); $form = $crawler->selectButton($this->lang('LOGIN'))->form();
$crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-user')); $crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-user'));
$this->assertNotContains($this->lang('LOGIN'), $crawler->filter('.navbar')->text()); $this->assertNotContains($this->lang('LOGIN'), $crawler->filter('.navbar')->text());
$cookies = self::$cookieJar->all();
// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
foreach ($cookies as $cookie);
{
if (substr($cookie->getName(), -4) == '_sid')
{
$this->sid = $cookie->getValue();
} }
} }
$this->logout();
$crawler = self::request('GET', 'ucp.php');
$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
$form = $crawler->selectButton($this->lang('LOGIN'))->form();
// Try logging in with the old password
$crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-userreset-password-test-user'));
$this->assertContains($this->lang('LOGIN_ERROR_PASSWORD', '', ''), $crawler->filter('html')->text());
}
protected function get_user_data() protected function get_user_data()
{ {
$db = $this->get_db(); $db = $this->get_db();