diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-26 19:19:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-26 19:19:08 +0200 |
| commit | 06379aece8dccdfddfdf2255b12edf5e9df772ec (patch) | |
| tree | ce0080b7cdb3b9b03d1d2ce713222fe257c5e64d /tests/functional/common_groups_test.php | |
| parent | 62a751fa65753fa40057b1f816eb1fae894a25af (diff) | |
| parent | 2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497 (diff) | |
| download | forums-06379aece8dccdfddfdf2255b12edf5e9df772ec.tar forums-06379aece8dccdfddfdf2255b12edf5e9df772ec.tar.gz forums-06379aece8dccdfddfdf2255b12edf5e9df772ec.tar.bz2 forums-06379aece8dccdfddfdf2255b12edf5e9df772ec.tar.xz forums-06379aece8dccdfddfdf2255b12edf5e9df772ec.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11538] Add optional switch as argument to hex colour validation
[ticket/11538] Modify test colour values
[ticket/11538] Limit comment in acp_groups to 80 characters per line
[ticket/11538] Move group ID into abstract test class and add more test cases
[ticket/11538] Merge calls to validate_data() in acp_groups
[ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
[ticket/11538] Use abstract class for functional test cases for group colour
[ticket/11538] Add function phpbb_validate_colour for validating colours
[ticket/11538] Make sure regex doesn't allow multiple color values
[ticket/11538] Add tests for acp group manage page
[ticket/11538] Simplify colour value check and remove support for '#'
[ticket/11538] Fix incorrect regex and test for duplicate # in color string
[ticket/11538] Use regex for testing color value and improve tests
[ticket/11538] Make sure group color can't exceed maximum of 6 characters
Conflicts:
phpBB/includes/functions_user.php
phpBB/styles/prosilver/template/ucp_groups_manage.html
Diffstat (limited to 'tests/functional/common_groups_test.php')
| -rw-r--r-- | tests/functional/common_groups_test.php | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php new file mode 100644 index 0000000000..0bee9ca527 --- /dev/null +++ b/tests/functional/common_groups_test.php @@ -0,0 +1,61 @@ +<?php +/** +* +* @package testing +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @group functional +*/ +abstract class phpbb_functional_common_groups_test extends phpbb_functional_test_case +{ + abstract protected function get_url(); + + public function groups_manage_test_data() + { + return array( + 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'), + array('ag0', 'WRONG_DATA_COLOUR'), + array('#aa0', 'WRONG_DATA_COLOUR'), + array('AA0000 ', 'GROUP_UPDATED'), + array('AA0000 abf', 'WRONG_DATA_COLOUR'), + array('AA0000 AA0000', 'WRONG_DATA_COLOUR'), + array('', 'GROUP_UPDATED'), + array('000', 'GROUP_UPDATED'), + array('000000', 'GROUP_UPDATED'), + ); + } + + /** + * @dataProvider groups_manage_test_data + */ + public function test_groups_manage($input, $expected) + { + $this->markTestIncomplete( + 'Test fails on develop due to another test deleting the Administrators group.' + ); + // See https://github.com/phpbb/phpbb3/pull/1407#issuecomment-18465480 + // and https://gist.github.com/bantu/22dc4f6c6c0b8f9e0fa1 + + $this->login(); + $this->admin_login(); + $this->add_lang(array('ucp', 'acp/groups')); + + // 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); + $crawler = $this->client->submit($form); + $this->assertContains($this->lang($expected), $crawler->text()); + } +} |