1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

130 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
e77c8ee4ef [ticket/11568] Remove manual calls to assert_response_success()
PHPBB3-11568
2013-05-27 23:10:07 +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
Nathaniel Guse
367b3dac8c Merge remote-tracking branch 'remotes/blitze/ticket/11458' into develop 2013-05-18 07:01:51 -05: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
Marc Alexander
204cdb2164 [ticket/11538] Make sure regex doesn't allow multiple color values
This will now make sure that 'AAFF00' will be matched but strings like
'AAFF00 AABB00' will not.

PHPBB3-11538
2013-05-15 12:30:05 +02:00
Marc Alexander
cbe4a3c3b6 [ticket/11538] Add tests for acp group manage page
This will currently test if the colour check properly works.

PHPBB3-11538
2013-05-14 22:50:17 +02:00
Marc Alexander
deefe5c0e4 [ticket/11538] Simplify colour value check and remove support for '#'
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.

PHPBB3-11538
2013-05-14 22:39:33 +02:00
Marc Alexander
1fae7720e4 [ticket/11538] Fix incorrect regex and test for duplicate # in color string
PHPBB3-11538
2013-05-14 21:27:25 +02:00
Marc Alexander
a547ba3f9d [ticket/11538] Use regex for testing color value and improve tests
We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.

PHPBB3-11538
2013-05-14 19:44:55 +02:00
Marc Alexander
b7b0b0ccc3 [ticket/11538] Make sure group color can't exceed maximum of 6 characters
In order to prevent future issues with this, a basic set of functional
tests for the UCP groups manage page have been added.

PHPBB3-11538
2013-05-14 13:43:53 +02:00
Nathan Guse
bcf7ea3310 Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
  [ticket/11533] Update unit tests
  [ticket/11533] Fix colspan and unnecessary tables
  [ticket/11533] Change list to table for notification settings
  [ticket/11533] Columns counter for notification settings
2013-05-12 18:56:34 -05:00
Marc Alexander
bd6cebfe38 [ticket/11465] Increase count of disabled extensions to 5 in functional test
The ACP function test checks the amount of disabled extensions. Due to
the added disabled extension for the tests of the acp_modules method
get_module_infos(), this needed to be increased from 4 to 5.

PHPBB3-11465
2013-05-12 22:44:59 +02:00
Vjacheslav Trushkin
f17e67364d [ticket/11533] Update unit tests
Update notification settings functional unit test for new layout

PHPBB3-11533
2013-05-11 23:33:40 +03:00
OpenShift guest
48e1be58db [ticket/11458] Update functional test
Show that the phpbb permission lanuage file is being included

PHPBB3-11458
2013-05-11 02:43:02 -04:00
OpenShift guest
109b1a3a95 [ticket/11458] Use helper to create/move/delete directories/files
PHPBB3-11458
2013-05-09 23:14:09 -04:00
Oleg Pudeyev
88d4964f0e Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
  [ticket/10325] move migration into a new file
  [ticket/10325] fix acp language
  [ticket/10325] use assert_response_success parts
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] add assert_response_success in test
  [ticket/10325] functional tests for forgot password functionality
  [ticket/10325] add logout function in functional_test_case
  [ticket/10325] fix language in acp and ucp
  [ticket/10325] improve acp option language
  [ticket/10325] fix language key
  [ticket/10325] fix language variable
  [ticket/10325] change language var
  [ticket/10325] fix language
  [ticket/10325] add new config value to database
  [ticket/10325] trigger error if forgot password option disabled
  [ticket/10325] add allow forgot password option in acp
2013-05-08 08:23:11 -04:00
Joas Schilling
54680b9709 [ticket/11450] Limit scopes of filters and add better docs
PHPBB3-11450
2013-05-08 08:47:28 +02:00
Joas Schilling
4c9c1d8c02 [ticket/11450] Use helpers to copy/remove files
PHPBB3-11450
2013-05-08 08:47:27 +02:00
Joas Schilling
d75af4109f [ticket/11450] Add new line at end of file
PHPBB3-11450
2013-05-08 08:47:26 +02:00
Joas Schilling
0de153d903 [ticket/11450] Add test for unexisting composer.json
PHPBB3-11450
2013-05-08 08:47:23 +02:00
Joas Schilling
269c2ce98d [ticket/11450] Test the extensions details page in ACP Customise Tab
PHPBB3-11450
2013-05-08 08:47:22 +02:00
Dhruv
1d0c8a1fe8 [ticket/10325] use assert_response_success parts
PHPBB3-10325
2013-04-30 23:09:28 +05:30
Dhruv
a5b5e4b31d [ticket/10325] add assert_response_success in test
PHPBB3-10325
2013-04-30 22:29:20 +05:30
Dhruv
27aa5e7b71 [ticket/10325] functional tests for forgot password functionality
PHPBB3-10325
2013-04-25 22:58:03 +05:30
Andreas Fischer
a0d10cd7fc Merge remote-tracking branch 'nickvergessen/ticket/11491' into develop
* nickvergessen/ticket/11491:
  [ticket/11491] Copy files back only if we saved them previously
  [ticket/11491] Only copy files from phpBB/ext/ the directory exists
  [ticket/11491] Correctly remove the store/temp_ext/ directory after use
  [ticket/11491] Fix path to the ext/ folder
  [ticket/11491] Add extension_acp_test.php to functional group
  [ticket/11491] Fix class name of functional test
  [ticket/11491] Move file to correct directory
2013-04-15 14:56:13 -04:00
Joas Schilling
6bcc220df3 [ticket/11494] Filter crawler in first place
PHPBB3-11494
2013-04-15 03:37:03 +02:00
OpenShift guest
9e2acdab9a [ticket/11458] Fix functional test again
Add 'u_foo' to phpbb_acl_options
Make sure extension and fixtures are added before running test

PHPBB3-11458
2013-04-14 17:57:36 -04:00
OpenShift guest
2c910999b0 [ticket/11458] Fix test
PHPBB-11458
2013-04-13 13:56:02 -04:00
Joas Schilling
cbfe866eba [ticket/11494] Use functions instead of repeating
PHPBB3-11494
2013-04-13 18:03:02 +02:00
OpenShift guest
84c815a12e [ticket/11458] Add functional test
Since there is no test method to include extension language files, a
functional test seems more appropriate.
We add a permission mask 'acl_u_foo' with translation found in extenion
'bar' and confirm that the permission language file 'permissions_foo.php'
from 'bar' was added by asserting that 'Can view foo' exists when viewing
user permissions in acp

PHPBB3-11458
2013-04-13 11:24:47 -04:00
Joas Schilling
13ca1f5598 [ticket/11491] Copy files back only if we saved them previously
PHPBB3-11491
2013-04-12 02:18:38 +02:00
Joas Schilling
3436e3f102 [ticket/11491] Only copy files from phpBB/ext/ the directory exists
PHPBB3-11491
2013-04-12 02:03:58 +02:00
Joas Schilling
0b64db275b [ticket/11491] Correctly remove the store/temp_ext/ directory after use
PHPBB3-11491
2013-04-12 01:40:45 +02:00
Joas Schilling
56bcf7497e [ticket/11491] Fix path to the ext/ folder
PHPBB3-11491
2013-04-12 01:10:09 +02:00
Joas Schilling
08e7bd6166 [ticket/11491] Add extension_acp_test.php to functional group
PHPBB3-11491
2013-04-12 01:09:09 +02:00
Joas Schilling
4c99229be8 [ticket/11491] Fix class name of functional test
PHPBB3-11491
2013-04-12 01:08:40 +02:00
Joas Schilling
b2b8b62fad [ticket/11491] Move file to correct directory
PHPBB3-11491
2013-04-12 01:08:09 +02:00
Joas Schilling
5c24474c2a [ticket/11494] Fix memberlist leaders functional tests
The scope of the crawler should be reduced to the specific table

PHPBB3-11494
2013-04-11 22:11:52 +02:00
Joas Schilling
4d4cf25edd [ticket/11492] Fix the test once more
PHPBB3-11492
2013-04-11 16:29:15 +02:00
Joas Schilling
f920c69ad5 [ticket/11492] Split into mutliple tests
PHPBB3-11492
2013-04-11 15:44:54 +02:00
Joas Schilling
e5503e20d8 [ticket/11492] Do not add the user again
PHPBB3-11492
2013-04-11 15:28:55 +02:00
Joas Schilling
59ad90b25c [ticket/11492] Add tests for removing/adding users
PHPBB3-11492
2013-04-11 15:20:14 +02:00
Joas Schilling
60713c8a20 [ticket/11492] Add functional test for empty teampage
PHPBB3-11492
2013-04-11 15:00:22 +02:00
Andreas Fischer
d3decaeedf [ticket/11460] Add default behaviour tests for notification and email types.
PHPBB3-11460
2013-03-24 23:42:13 +01:00