aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Use assert_checkbox_is_checked for registration test
| * | | | [ticket/13207] Use assert_checkbox_is_checked for registration testMarc Alexander2014-10-251-3/+2
| |/ / / | | | | | | | | | | | | PHPBB3-13207
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-251-2/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13207] Add notification manager mock to user_add method in tests [ticket/13207] Move default user notifications settings to user_add() [ticket/13207] Add default subscription options for newly registered users
| * | | [ticket/13207] Add default subscription options for newly registered usersMarc Alexander2014-10-251-2/+14
| | | | | | | | | | | | | | | | PHPBB3-13207
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-10-211-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13189] Do not use confirm box for marking all notifications read
| * | | [ticket/13189] Do not use confirm box for marking all notifications readMarc Alexander2014-10-201-2/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | We already use a token for preventing CSRF when marking notifications read. Making a user confirm the marking read action serves no real purpose. No information will be lost by just marking the notifications read but it will prevent users from always having to confirm this action. PHPBB3-13189
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-071-0/+85
|\ \ \ | |/ /
| * | Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-071-0/+85
| |\ \ | | | | | | | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| | * | [ticket/12983] Do not test invalid values until Symfony 2.4Joas Schilling2014-09-071-9/+27
| | | | | | | | | | | | | | | | PHPBB3-12983
| | * | [ticket/12983] Add functional test for ucp pref moduleJoas Schilling2014-09-061-0/+67
| | | | | | | | | | | | | | | | PHPBB3-12983
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| * | | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-021-1/+1
|\ \ \ | |/ /
| * | Merge pull request #2908 from Pico/t/12661Marc Alexander2014-09-021-1/+1
| |\ \ | | | | | | | | | | | | [ticket/12661] Load extensions templates from "all" folder by render()
| | * | [ticket/12661] Add template testPico882014-08-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12661
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-247-0/+68
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13008] Add functionnal test [ticket/13008] Use an absolute path with the FileLocator for the routing files
| * | | [ticket/13008] Add functionnal testTristan Darricau2014-08-247-0/+68
| |/ / | | | | | | | | | PHPBB3-13008
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-8/+8
|\ \ \ | |/ /
| * | [ticket/12990] Fix unit testsTristan Darricau2014-08-171-8/+8
| | | | | | | | | | | | PHPBB3-12990
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-115-15/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-115-15/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-075-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| | * | [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-071-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-64/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | | Merge pull request #2852 from bantu/ticket/12938Joas Schilling2014-08-101-64/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12938] Remove the 'Download all attachments' feature. * bantu/ticket/12938: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| | * | | [ticket/12938] Remove functional tests for 'Download all attachments'.Andreas Fischer2014-08-101-64/+0
| | |/ / | | | | | | | | | | | | PHPBB3-12938
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-104-8/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/11528] Revert Mink changes
| * | | [ticket/11528] Revert Mink changesDhruv2014-08-094-8/+0
| |/ / | | | | | | | | | PHPBB3-11528
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-0/+2
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12918] Load class fileupload in fileupload_remote_test.php.
| * | [ticket/12918] Load class fileupload in fileupload_remote_test.php.Andreas Fischer2014-08-071-0/+2
| | | | | | | | | | | | PHPBB3-12918
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-1/+5
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12847] Allow the extensions to say if they can be enabled
| * | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-071-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| | * | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-131-1/+5
| | | | | | | | | | | | | | | | PHPBB3-12847
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-071-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11148] Remove unneeded variable mimetype and use type octet-stream [ticket/11148] Change expected output with disallowed content in test [ticket/11148] Always use the output of the mimetype guesser in get_mimetype [ticket/11148] Get rid of extra line in mimetype guesser setter doc block [ticket/11148] Add missing parts to docblock of get_mimetype() method [ticket/11148] Default to application/octet-stream if no mimetype given [ticket/11148] Use mimetype guesser for uploaded avatars [ticket/11148] Pass mimetype guesser to upload_attachment() function [ticket/11148] Add mimetype guesser to filespec and fileupload class
| * | | Merge remote-tracking branch 'github-marc1706/ticket/11148' into ↵Nils Adermann2014-08-071-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/11148: [ticket/11148] Remove unneeded variable mimetype and use type octet-stream [ticket/11148] Change expected output with disallowed content in test [ticket/11148] Always use the output of the mimetype guesser in get_mimetype [ticket/11148] Get rid of extra line in mimetype guesser setter doc block [ticket/11148] Add missing parts to docblock of get_mimetype() method [ticket/11148] Default to application/octet-stream if no mimetype given [ticket/11148] Use mimetype guesser for uploaded avatars [ticket/11148] Pass mimetype guesser to upload_attachment() function [ticket/11148] Add mimetype guesser to filespec and fileupload class
| | * | | [ticket/11148] Change expected output with disallowed content in testMarc Alexander2014-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11148
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-011-0/+69
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/11480] Header file [ticket/11480] Fix unit tests [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
| * | | | [ticket/11480] Header fileTristan Darricau2014-07-311-3/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| * | | | Merge branch 'ticket/11480' into ticket/11480-ascraeusTristan Darricau2014-07-301-0/+65
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * | [ticket/11480] Fix typosTristan Darricau2014-05-291-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11480
| | * | [ticket/11480] Add functionnal testTristan Darricau2014-05-291-0/+64
| | | | | | | | | | | | | | | | PHPBB3-11480
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-07-111-0/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12818] Use assertGreaterThanOrEqual in the tests [ticket/12818] Don't use the id for i= [ticket/12818] Add tests [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
| * | | [ticket/12818] Use assertGreaterThanOrEqual in the testsTristan Darricau2014-07-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12818
| * | | [ticket/12818] Don't use the id for i=Tristan Darricau2014-07-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12818
| * | | [ticket/12818] Add testsTristan Darricau2014-07-071-0/+16
| | | | | | | | | | | | | | | | PHPBB3-12818
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-07-045-59/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12013] Fix functional tests and sniffer issue. [ticket/12013] Clear the jumpbox. [ticket/12013] Add moderator tools icon. [ticket/12013] Remove obsolete jumpbox and quickmod CSS. [ticket/12013] Prevent the dropdown scrollbar from overlapping the content. [ticket/12013] Update to use the new .button class. [ticket/12013] Add missing class to place the buttons on the rightside. [ticket/12013] Use the correct variable for the forum id. [ticket/12013] Use DEFINE instead of Twig's set. [ticket/12013] Use path helper. [ticket/12013] Use new dropdown for quickmod tools and jumpbox.
| * | | [ticket/12013] Fix functional tests and sniffer issue.Cesar G2014-07-045-59/+19
| | | | | | | | | | | | | | | | PHPBB3-12013
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-07-031-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12783] Move phpbb requirement to extra->soft-require [ticket/12783] Correctly use dataProviders and mark tests as incomplete [ticket/12783] Move phpbb/phpbb require version to extra
| * | | [ticket/12783] Move phpbb requirement to extra->soft-requireJoas Schilling2014-07-021-1/+3
| | | | | | | | | | | | | | | | PHPBB3-12783
| * | | [ticket/12783] Move phpbb/phpbb require version to extraJoas Schilling2014-06-281-3/+3
| | |/ | |/| | | | | | | PHPBB3-12783