aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-05-19 11:44:26 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-05-19 11:44:26 +0200
commit8aea2b382dcb57f67704dec5194378d9a76c127e (patch)
tree92885daea7b5874b97c371edb4f1ee1955f68f7a /tests/functional
parent373e26ca746699f466e768406b951e6cf09ed284 (diff)
downloadforums-8aea2b382dcb57f67704dec5194378d9a76c127e.tar
forums-8aea2b382dcb57f67704dec5194378d9a76c127e.tar.gz
forums-8aea2b382dcb57f67704dec5194378d9a76c127e.tar.bz2
forums-8aea2b382dcb57f67704dec5194378d9a76c127e.tar.xz
forums-8aea2b382dcb57f67704dec5194378d9a76c127e.zip
[ticket/11538] Move group ID into abstract test class and add more test cases
The group ID is defined in the abstract class now and additional test cases for hex colour values have been added. PHPBB3-11538
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/acp_groups_test.php2
-rw-r--r--tests/functional/common_groups_test.php6
-rw-r--r--tests/functional/ucp_groups_test.php2
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php
index 8b45bea7a6..3d8cabb086 100644
--- a/tests/functional/acp_groups_test.php
+++ b/tests/functional/acp_groups_test.php
@@ -16,6 +16,6 @@ class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_te
{
protected function get_url()
{
- return 'adm/index.php?i=groups&mode=manage&action=edit&g=5';
+ return 'adm/index.php?i=groups&mode=manage&action=edit';
}
}
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 3061bf7510..985dbc9220 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -20,6 +20,7 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
array('#AA0000', 'WRONG_DATA_COLOUR'),
array('AA0000', 'GROUP_UPDATED'),
array('AA0000v', 'WRONG_DATA_COLOUR'),
+ array('AA00000', 'WRONG_DATA_COLOUR'),
array('vAA0000', 'WRONG_DATA_COLOUR'),
array('AAG000','WRONG_DATA_COLOUR'),
array('a00', 'GROUP_UPDATED'),
@@ -28,6 +29,8 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
array('AA0000 ', 'GROUP_UPDATED'),
array('AA0000 abf', 'WRONG_DATA_COLOUR'),
array('AA0000 AA0000', 'WRONG_DATA_COLOUR'),
+ array('000 ', 'GROUP_UPDATED'),
+ array('000000 ', 'GROUP_UPDATED'),
);
}
@@ -40,7 +43,8 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
$this->admin_login();
$this->add_lang(array('ucp', 'acp/groups'));
- $crawler = $this->request('GET', $this->get_url() . '&sid=' . $this->sid);
+ // Manage Administrators group
+ $crawler = $this->request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
$this->assert_response_success();
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$form['group_colour']->setValue($input);
diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php
index 8401cfdb09..9c6b1edc5e 100644
--- a/tests/functional/ucp_groups_test.php
+++ b/tests/functional/ucp_groups_test.php
@@ -16,6 +16,6 @@ class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_te
{
protected function get_url()
{
- return 'ucp.php?i=groups&mode=manage&action=edit&g=5';
+ return 'ucp.php?i=groups&mode=manage&action=edit';
}
}