aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-10-25 16:56:26 -0700
committerNils Adermann <naderman@naderman.de>2014-10-25 16:56:26 -0700
commit33d0872a18e38a694352fcd604649bc65c7da16d (patch)
treef3e1ba9faffce7c0540e249d5264283b2915ba2b /tests/functional
parent12f7275c8eb636d96ffdd6ab6e7c913a7b567164 (diff)
parent26d4483d36ec82f6dc8f4943f289be94302ab7ce (diff)
downloadforums-33d0872a18e38a694352fcd604649bc65c7da16d.tar
forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar.gz
forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar.bz2
forums-33d0872a18e38a694352fcd604649bc65c7da16d.tar.xz
forums-33d0872a18e38a694352fcd604649bc65c7da16d.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/registration_test.php16
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php
index 45a684db19..26473c4fcd 100644
--- a/tests/functional/registration_test.php
+++ b/tests/functional/registration_test.php
@@ -45,12 +45,24 @@ class phpbb_functional_registration_test extends phpbb_functional_test_case
$form = $crawler->selectButton('Submit')->form(array(
'username' => 'user-reg-test',
'email' => 'user-reg-test@phpbb.com',
- 'new_password' => 'testtest',
- 'password_confirm' => 'testtest',
+ 'new_password' => 'user-reg-testuser-reg-test',
+ 'password_confirm' => 'user-reg-testuser-reg-test',
));
$form['tz']->select('Europe/Berlin');
$crawler = self::submit($form);
$this->assertContainsLang('ACCOUNT_ADDED', $crawler->filter('#message')->text());
}
+
+ /**
+ * @depends test_register_new_account
+ */
+ public function test_default_subscription_options()
+ {
+ $this->login('user-reg-test');
+ $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options&sid=' . $this->sid);
+ $form_values = $crawler->selectButton('Submit')->form()->getValues();
+ $this->assertEquals(1, $form_values['notification.type.post_notification.method.email']);
+ $this->assertEquals(1, $form_values['notification.type.topic_notification.method.email']);
+ }
}