aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional/common_groups_test.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-05-27 11:52:44 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-05-27 11:52:44 +0200
commit00326517291fc093e87e9bbeeeb923ae0f373414 (patch)
tree4f57f17c19e6c1e7aa5ac37f016c0ce4fc70a6ed /tests/functional/common_groups_test.php
parent06379aece8dccdfddfdf2255b12edf5e9df772ec (diff)
parentf77111fe0e2f590898bea89ec771ba87aeceee6e (diff)
downloadforums-00326517291fc093e87e9bbeeeb923ae0f373414.tar
forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar.gz
forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar.bz2
forums-00326517291fc093e87e9bbeeeb923ae0f373414.tar.xz
forums-00326517291fc093e87e9bbeeeb923ae0f373414.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [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/common_groups_test.php')
-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 0bee9ca527..cc6afa54b9 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'),
);
}