Commit graph

8 commits

Author SHA1 Message Date
Joas Schilling
6d9888be65 Merge branch 'ticket/11568' into ticket/11568-develop
* ticket/11568:
  [ticket/11568] Add method to get page content
  [ticket/11568] Allow different status codes
  [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
  [ticket/11568] Fix common_groups_test.php form handling
  [ticket/11568] Make CookieJar static aswell
  [ticket/11568] Remove manual calls to assert_response_success()
  [ticket/11568] Only use a static version of the client
  [ticket/11568] Any output before the doc type means there was an error
  [ticket/11568] Set client manually so we can increase the cURL timeout
  [ticket/11568] Use Goutte Client to install the board for functional tests

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-05-28 14:51:06 +02:00
Joas Schilling
9be57ec076 [ticket/11568] Fix common_groups_test.php form handling
PHPBB3-11568
2013-05-27 23:10:08 +02:00
Joas Schilling
0032651729 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().
2013-05-27 11:52:44 +02:00
Andreas Fischer
3faae5c98c [ticket/11538] Cut functional tests down a bit as these are more expensive.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
06379aece8 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
2013-05-26 19:19:08 +02:00
Marc Alexander
e49b4543de [ticket/11538] Modify test colour values
PHPBB3-11538
2013-05-19 15:17:47 +02:00
Marc Alexander
8aea2b382d [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
2013-05-19 11:44:26 +02:00
Marc Alexander
0a5988ec1f [ticket/11538] Use abstract class for functional test cases for group colour
PHPBB3-11538
2013-05-17 18:31:17 +02:00