diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:26:41 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-04-10 14:26:41 -0700 |
| commit | 3f74e5b88b196b1d5108c372977406f4417bbae4 (patch) | |
| tree | e0287b1975c79344e804231ec95ed74b91cea704 /tests/functional | |
| parent | 62fad6ae9b5218773094bdd9fe55cb08b63dc12d (diff) | |
| parent | c99584ec7b6b32439b4af9486cddd38bf30b64d4 (diff) | |
| download | forums-3f74e5b88b196b1d5108c372977406f4417bbae4.tar forums-3f74e5b88b196b1d5108c372977406f4417bbae4.tar.gz forums-3f74e5b88b196b1d5108c372977406f4417bbae4.tar.bz2 forums-3f74e5b88b196b1d5108c372977406f4417bbae4.tar.xz forums-3f74e5b88b196b1d5108c372977406f4417bbae4.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into develop-ascraeus
* github-nickvergessen/ticket/12370:
[ticket/12370] Add unit tests for topic notifications
[ticket/12370] Fix functional notification test and remove unneeded requests
[ticket/12370] Do not delete topic notifications when the topic is visible
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/notification_test.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php index 9ae37842fe..18e8a4ecc0 100644 --- a/tests/functional/notification_test.php +++ b/tests/functional/notification_test.php @@ -59,20 +59,17 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case $this->create_user('notificationtestuser'); $this->add_user_group('NEWLY_REGISTERED', array('notificationtestuser')); $this->login('notificationtestuser'); - $crawler = self::request('GET', 'index.php'); - $this->assertContains('notificationtestuser', $crawler->filter('#username_logged_in')->text()); // Post a new post that needs approval $this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD'); $crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}"); $this->assertNotContains('This is a test post posted by notificationtestuser.', $crawler->filter('html')->text()); - // logout - $crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout'); - - // admin login + // Login as admin + $this->logout(); $this->login(); $this->add_lang('ucp'); + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications'); // At least one notification should exist |