mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Andreas Fischer
2013-05-26 19:19:08 +02:00
parent 62a751fa65 2b356e766f
commit 06379aece8
8 changed files with 153 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/functional/acp_groups_test.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/common_groups_test.php';
/**
* @group functional
*/
class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_test
{
protected function get_url()
{
return 'adm/index.php?i=groups&mode=manage&action=edit';
}
}

61
tests/functional/common_groups_test.php Normal file
View File

@@ -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());
}
}

21
tests/functional/ucp_groups_test.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/common_groups_test.php';
/**
* @group functional
*/
class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test
{
protected function get_url()
{
return 'ucp.php?i=groups&mode=manage&action=edit';
}
}