aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-05-27 11:51:26 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-05-27 11:51:26 +0200
commitf77111fe0e2f590898bea89ec771ba87aeceee6e (patch)
tree897e2c9291ec1d9a760b9bf479e410e3d53e0bc8 /tests/functional
parent2b356e766f8d0f3e9dfc2d1fdd6bc857fdb63497 (diff)
parent3faae5c98cfe9d3b6245a892808aee19bc9c1fcc (diff)
downloadforums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar
forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar.gz
forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar.bz2
forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.tar.xz
forums-f77111fe0e2f590898bea89ec771ba87aeceee6e.zip
Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympus
* remotes/bantu/ticket/11538: [ticket/11538] Cut functional tests down a bit as these are more expensive. [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass. [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/common_groups_test.php18
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 02a538d46e..7ccd78421e 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -17,21 +17,11 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
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'),
+ array('aa0000', 'GROUP_UPDATED'),
+
+ array('AAG000','WRONG_DATA_COLOUR'),
+ array('#AA0000', 'WRONG_DATA_COLOUR'),
);
}