aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorFyorl <gaelreth@gmail.com>2012-07-09 00:24:28 +0100
committerOleg Pudeyev <oleg@bsdpower.com>2012-12-06 22:10:09 -0500
commitcafc7feca12730fce59091bd7a18fb5c3f7ecdc0 (patch)
tree2cf76c23f3c9c4bae26cc7a2e2f3ade5be4dc497 /tests/functional
parent70050020699d9eab9b97bda342e0e928d1591de8 (diff)
downloadforums-cafc7feca12730fce59091bd7a18fb5c3f7ecdc0.tar
forums-cafc7feca12730fce59091bd7a18fb5c3f7ecdc0.tar.gz
forums-cafc7feca12730fce59091bd7a18fb5c3f7ecdc0.tar.bz2
forums-cafc7feca12730fce59091bd7a18fb5c3f7ecdc0.tar.xz
forums-cafc7feca12730fce59091bd7a18fb5c3f7ecdc0.zip
[ticket/10972] Moved tests into appropriate places and added comments
PHPBB3-10972
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/auth_test.php9
-rw-r--r--tests/functional/new_user_test.php45
2 files changed, 9 insertions, 45 deletions
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index e955dcb4df..e67118d8f9 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -21,6 +21,15 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
}
+ public function test_login_other()
+ {
+ $this->create_user('user');
+ $this->login('user');
+ $crawler = $this->request('GET', 'index.php');
+ $this->assertContains('user', $crawler->filter('.icon-logout')->text());
+ $this->delete_user('user');
+ }
+
/**
* @depends test_login
*/
diff --git a/tests/functional/new_user_test.php b/tests/functional/new_user_test.php
deleted file mode 100644
index db2f31f450..0000000000
--- a/tests/functional/new_user_test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group functional
-*/
-class phpbb_functional_new_user_test extends phpbb_functional_test_case
-{
- public function test_create_user()
- {
- $this->create_user('user');
- $this->login();
- $crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
- $this->assertContains('user', $crawler->filter('#memberlist tr')->eq(1)->text());
- }
-
- /**
- * @depends test_create_user
- */
- public function test_delete_user()
- {
- $this->delete_user('user');
- $this->login();
- $crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
- $this->assertEquals(2, $crawler->filter('#memberlist tr')->count());
- }
-
- /**
- * @depends test_delete_user
- */
- public function test_login_other()
- {
- $this->create_user('user');
- $this->login('user');
- $crawler = $this->request('GET', 'index.php');
- $this->assertContains('user', $crawler->filter('.icon-logout')->text());
- $this->delete_user('user');
- }
-}