aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-0/+49
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
| * [ticket/11548] Use new static methods for request and submitMarc Alexander2013-07-111-5/+4
| | | | | | | | PHPBB3-11548
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-116-27/+122
| |\ | | | | | | | | | ticket/11548
| | * [ticket/10772] Updating testsVjacheslav Trushkin2013-07-111-12/+6
| | | | | | | | | | | | PHPBB3-10772
| * | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Up to now the array_map() that turns error messages into the localized output was only ran if the group's color was set. With this patch it'll run the array_map() on the complete error array if it's not empty. PHPBB3-11548
* | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-111-28/+20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Nathaniel Guse (1) and Vjacheslav Trushkin (1) * develop-olympus: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style Conflicts: tests/functional/forum_style_test.php
| * | Merge remote-tracking branch 'remotes/cyberalien/ticket/10772' into ↵Nathaniel Guse2013-07-111-0/+51
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/10772: [ticket/10772] Remove unnecessary comment [ticket/10772] Functional tests for forum style [ticket/10772] Use forum specific style for trigger_error
| | * | [ticket/10772] Functional tests for forum styleVjacheslav Trushkin2013-05-161-0/+51
| | | | | | | | | | | | | | | | PHPBB3-10772
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/develop/10772' into ↵Nathaniel Guse2013-07-111-0/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/develop/10772: [ticket/develop/10772] Fix copyright year [ticket/develop/10772] Unit tests for forum specific style [ticket/10772] Use forum specific style for trigger_error
| * | | | [ticket/develop/10772] Fix copyright yearVjacheslav Trushkin2013-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10772
| * | | | [ticket/develop/10772] Unit tests for forum specific styleVjacheslav Trushkin2013-05-111-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unit tests for forum specific style for 3.1 branch PHPBB3-10772
* | | | | Merge branch 'ticket/11566' into ticket/11566-developDhruv2013-07-011-0/+61
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | [ticket/11566] Check that guest doesn't have reporting permission by defaultDhruv2013-07-011-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11566
| * | | | [ticket/11566] Revert forum permission changesDhruv2013-07-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the f_report permission for guests in the functional tests PHPBB3-11566
| * | | | [ticket/11566] Use language variable instead of hardcodeDhruv2013-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add language variable in tests PHPBB3-11566
| * | | | [ticket/11566] add tests for reporting postDhruv2013-07-011-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functional test for reporting post and check if captcha validation is required for guests and not for registerted users PHPBB3-11566
* | | | | [ticket/9341] Assert that page doesnt contain next or prev page postsDhruv2013-06-281-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9341
* | | | | [ticket/9341] Follow the Next/Prev link in testsDhruv2013-06-281-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | follow the next/prev link and then assert if the page contains its last post or not PHPBB3-9341
* | | | | [ticket/9341] Add tests for checking Next and Previous template varsDhruv2013-06-271-0/+33
| | | | | | | | | | | | | | | | | | | | PHPBB3-9341
* | | | | [ticket/9341] Move create_topic and post into functional test caseDhruv2013-06-271-101/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_topic and create_post are moved into functional test case so that they can be used by other tests as well PHPBB3-9341
* | | | | [ticket/11550] Specify a valid path so it's clearer that it must be a pathJoas Schilling2013-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11550
* | | | | [ticket/11550] Move comments to correct functionJoas Schilling2013-06-115-40/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11550
* | | | | [ticket/11550] We use a different fixture set for extension_acp_test.phpJoas Schilling2013-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11550
* | | | | [ticket/11550] Fixtures should only be directories not filesJoas Schilling2013-06-081-4/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11550
* | | | | [ticket/11550] Use new functionality from the test case helpersJoas Schilling2013-06-085-158/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of duplicating the extension copy code, it is now in the helpers. So we remove the code from existing tests. PHPBB3-11550
* | | | | [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.phpJoas Schilling2013-06-081-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11550
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-06-078-11/+359
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/11587] Add functional tests for group teampage settingsMarc Alexander2013-06-043-6/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/11538] Add admin as admins leader and moderator in memberlist_testMarc Alexander2013-06-042-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/11549] Add functional test for ACP Extension Module with TemplateJoas Schilling2013-05-314-0/+193
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11549
* | | | | | Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-3112-56/+58
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | [ticket/11568] Use static calls for static methodsJoas Schilling2013-05-314-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11568
* | | | | | [ticket/develop/11568] Remove unneccessary second call with wrong argumentsJoas Schilling2013-05-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11568
* | | | | | [ticket/develop/11568] Fix some more tests in 3.1Joas Schilling2013-05-303-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11568
* | | | | | [ticket/develop/11568] Remove unneccessary calls to assert_response_success()Joas Schilling2013-05-289-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11568
* | | | | | [ticket/develop/11568] Do not directly access $client from testsJoas Schilling2013-05-286-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11568
* | | | | | Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-284-13/+2
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | [ticket/11568] Fix common_groups_test.php form handlingJoas Schilling2013-05-271-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11568
| * | | | [ticket/11568] Remove manual calls to assert_response_success()Joas Schilling2013-05-273-11/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-11568
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-14/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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().
| * | | [ticket/11538] Cut functional tests down a bit as these are more expensive.Andreas Fischer2013-05-261-14/+4
| | | | | | | | | | | | | | | | PHPBB3-11538
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-263-0/+103
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [ticket/11538] Modify test colour valuesMarc Alexander2013-05-191-2/+3
| | | | | | | | | | | | | | | | PHPBB3-11538
| * | | [ticket/11538] Move group ID into abstract test class and add more test casesMarc Alexander2013-05-193-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The group ID is defined in the abstract class now and additional test cases for hex colour values have been added. PHPBB3-11538
| * | | [ticket/11538] Use abstract class for functional test cases for group colourMarc Alexander2013-05-173-63/+60
| | | | | | | | | | | | | | | | PHPBB3-11538
| * | | [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-152-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
| * | | [ticket/11538] Add tests for acp group manage pageMarc Alexander2013-05-141-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | This will currently test if the colour check properly works. PHPBB3-11538
| * | | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | [ticket/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11538
| * | | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-37/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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