diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-10-28 19:49:38 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-10-28 19:49:38 +0100 |
| commit | ed64a69760c40fcb4a4b50f82773575f6d997ff5 (patch) | |
| tree | 10ae006262946adb0f2932c6506c3fbf2df6722d /tests/test_framework/phpbb_functional_test_case.php | |
| parent | dc109b195261e83465914e2457bd16e8158d9c21 (diff) | |
| parent | ddc9e318d05e2a61d0aec08edc1bb6a036dd221a (diff) | |
| download | forums-ed64a69760c40fcb4a4b50f82773575f6d997ff5.tar forums-ed64a69760c40fcb4a4b50f82773575f6d997ff5.tar.gz forums-ed64a69760c40fcb4a4b50f82773575f6d997ff5.tar.bz2 forums-ed64a69760c40fcb4a4b50f82773575f6d997ff5.tar.xz forums-ed64a69760c40fcb4a4b50f82773575f6d997ff5.zip | |
Merge pull request #4223 from senky/ticket/10432
[ticket/10432] Don't require username when user forgets password
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 12a296a4bf..d4856f954a 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -550,9 +550,10 @@ class phpbb_functional_test_case extends phpbb_test_case * Creates a new user with limited permissions * * @param string $username Also doubles up as the user's password + * @param string $email User email (defaults to nobody@example.com) * @return int ID of created user */ - protected function create_user($username) + protected function create_user($username, $email = 'nobody@example.com') { // Required by unique_id global $config; @@ -604,7 +605,7 @@ class phpbb_functional_test_case extends phpbb_test_case $user_row = array( 'username' => $username, 'group_id' => 2, - 'user_email' => 'nobody@example.com', + 'user_email' => $email, 'user_type' => 0, 'user_lang' => 'en', 'user_timezone' => 'UTC', |