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

215 Commits

Author SHA1 Message Date
Dhruv
c80b80ca0f Merge branch 'ticket/11566' into ticket/11566-develop
* ticket/11566:
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha

Conflicts:
	phpBB/report.php
2013-07-01 23:25:29 +05:30
Dhruv
84ec1f5423 [ticket/11566] Check that guest doesn't have reporting permission by default
PHPBB3-11566
2013-07-01 21:49:06 +05:30
Dhruv
434d14e1d5 [ticket/11566] Revert forum permission changes
Revert the f_report permission for guests in the functional tests

PHPBB3-11566
2013-07-01 21:49:01 +05:30
Dhruv
1abc3d91d0 [ticket/11566] Use language variable instead of hardcode
Add language variable in tests

PHPBB3-11566
2013-07-01 21:49:00 +05:30
Dhruv
43053c541a [ticket/11566] add tests for reporting post
Functional test for reporting post and check if captcha validation
is required for guests and not for registerted users

PHPBB3-11566
2013-07-01 21:48:59 +05:30
Dhruv
91e773a795 [ticket/9341] Assert that page doesnt contain next or prev page posts
PHPBB3-9341
2013-06-28 01:02:00 +05:30
Dhruv
22998ee5ee [ticket/9341] Follow the Next/Prev link in tests
follow the next/prev link and then assert if the page contains
its last post or not

PHPBB3-9341
2013-06-28 00:52:36 +05:30
Dhruv
bd9ece7ab6 [ticket/9341] Add tests for checking Next and Previous template vars
PHPBB3-9341
2013-06-27 00:59:37 +05:30
Dhruv
1f989c6be7 [ticket/9341] Move create_topic and post into functional test case
create_topic and create_post are moved into functional test case
so that they can be used by other tests as well

PHPBB3-9341
2013-06-27 00:57:34 +05:30
Marc Alexander
79dd44061b [ticket/11531] Add changes for supporting modified testing framework
Additionally, the groups avatar is deleted after the avatar tests in the
ucp groups page in order to prevent issues with other tests that expect
that no avatar has been set for the admin group.

PHPBB3-11531
2013-06-25 00:17:51 +02:00
Marc Alexander
2996120e97 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-06-18 18:08:44 +02:00
Joas Schilling
007cd61776 [ticket/11550] Specify a valid path so it's clearer that it must be a path
PHPBB3-11550
2013-06-11 11:37:28 +02:00
Joas Schilling
68d15f0f14 [ticket/11550] Move comments to correct function
PHPBB3-11550
2013-06-11 11:14:24 +02:00
Joas Schilling
0b3f182083 [ticket/11550] We use a different fixture set for extension_acp_test.php
PHPBB3-11550
2013-06-09 17:40:33 +02:00
Joas Schilling
7546c3a7a7 [ticket/11550] Fixtures should only be directories not files
PHPBB3-11550
2013-06-08 17:14:20 +02:00
Joas Schilling
a61ab1e5e4 [ticket/11550] Use new functionality from the test case helpers
Instead of duplicating the extension copy code, it is now in the helpers.
So we remove the code from existing tests.

PHPBB3-11550
2013-06-08 17:07:35 +02:00
Joas Schilling
3506408637 [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
PHPBB3-11550
2013-06-08 17:03:08 +02:00
Joas Schilling
1d7c80b912 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11568-develop
* 'develop' of https://github.com/phpbb/phpbb3: (29 commits)
  [ticket/11588] Also use version.phpbb.com in install_update.php.
  [ticket/11587] Add functional tests for group teampage settings
  [ticket/11538] Add admin as admins leader and moderator in memberlist_test
  [ticket/11587] Pass legend and teampage settings to group_create()
  [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
  [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
  [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
  [ticket/11586] Combine administrator/moderator checks together.
  [ticket/11583] Use a new lang key instead of giving the old one a new meaning.
  [ticket/11122] Add dhruv to active authors
  [ticket/11122] Remove Oleg and igorw from active authors
  [ticket/10840] Add check_form_key to acp_groups.php
  [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.
  [ticket/11409] Add success message after updating group position settings
  [ticket/11549] Add functional test for ACP Extension Module with Template
  [ticket/11570] Fix link and make the notice more conspiciuous
  [ticket/11549] Do not set extension dir path for style in adm/index.php
  [ticket/11570] Add link back to update process
  [ticket/11569] Add type parameter and fix language variable
  [ticket/11569] Add parameter to URL and remove comment
  ...

Conflicts:
	tests/functional/common_groups_test.php
2013-06-07 00:15:28 +02:00
Marc Alexander
495b22632c [ticket/11587] Add functional tests for group teampage settings
The group_legend and group_teampage settings, which are needed for the
teampage, are tested with these newly added functional tests.
Duplicate code has been reduced as much as possible.

PHPBB3-11587
2013-06-04 20:35:55 +02:00
Marc Alexander
71deb4dde7 [ticket/11538] Add admin as admins leader and moderator in memberlist_test
Removing the admin user from the admin and moderator group in memberlist_test
potentially breaks other tests, i.e. the ucp groups test.

PHPBB3-11538
2013-06-04 17:16:22 +02:00
Marc Alexander
af8c4b2900 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-06-03 22:42:49 +02:00
Joas Schilling
8c4670eeb1 Merge branch 'ticket/11568' into ticket/11568-develop
* ticket/11568:
  [ticket/11568] Split status code and html debug assertion into two methods
  [ticket/11568] Add comma at end of array key-value couple
  [ticket/11568] Invert logic for asserting the response
  [ticket/11568] Use static calls for static methods

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-05-31 16:45:06 +02:00
Joas Schilling
b7b81f6431 [ticket/11568] Use static calls for static methods
PHPBB3-11568
2013-05-31 16:16:41 +02:00
Joas Schilling
48036c6eda [ticket/11549] Add functional test for ACP Extension Module with Template
PHPBB3-11549
2013-05-31 14:25:47 +02:00
Joas Schilling
5c046b9493 [ticket/develop/11568] Remove unneccessary second call with wrong arguments
PHPBB3-11568
2013-05-30 16:16:49 +02:00
Joas Schilling
a36defb10f [ticket/develop/11568] Fix some more tests in 3.1
PHPBB3-11568
2013-05-30 13:26:16 +02:00
Joas Schilling
f1523944a0 [ticket/develop/11568] Remove unneccessary calls to assert_response_success()
PHPBB3-11568
2013-05-28 14:58:40 +02:00
Joas Schilling
467c4d62c4 [ticket/develop/11568] Do not directly access $client from tests
PHPBB3-11568
2013-05-28 14:55:04 +02:00
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
79823b9caf [ticket/11531] Remove incomplete flags for tests after merging PR #1404
Issues should be fixed by the now resolved ticket PHPBB3-11535:
http://tracker.phpbb.com/browse/PHPBB3-11535

PHPBB3-11531
2013-05-25 18:17:33 +02:00
Marc Alexander
76453b48dd [ticket/11531] Use assertContainsLang() where possible
PHBB3-11531
2013-05-25 18:15:54 +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
Vjacheslav Trushkin
56ac97e819 [ticket/10772] Functional tests for forum style
PHPBB3-10772
2013-05-16 09:24:16 +03: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
Marc Alexander
9c4d8b3193 [ticket/11531] Add acp and ucp groups functional tests for avatars
The test for the acp and ucp groups settings are currently marked as
incomplete due to a bug that causes the settings to not show an error
when incorrect data is entered. However, the avatar data is not saved.
That means that even though the error treatment seems to correctly work,
the user is never informed of the issues with the submitted avatar data.

PHPBB3-11531
2013-05-13 11:57:41 +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