aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2829-62/+292
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| * [ticket/11792] Add functional test for var lang_set_ext of core.user_setuprechosen2013-08-223-0/+111
| | | | | | | | | | | | | | | | | | To ensure that the new lang_set_ext variable available with the core.user_setup event works properly, a functional test was added. It overwrites the value of the 'SKIP' language key, which is assumed to remain in use for some time to come. PHPBB3-11792
| * Merge remote-tracking branch 'VSEphpbb/ticket/11784' into developDhruv2013-08-1812-1/+1
| |\ | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/11784: [ticket/11784] Remove naming redundancy for event listeners
| | * [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-1312-1/+1
| | | | | | | | | | | | PHPBB3-11784
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-152-1/+68
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-153-101/+198
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic
| | | * [ticket/11775] Fix doc blocks syntaxJoas Schilling2013-08-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11775
| | | * [ticket/11775] Remove spaces at line endsJoas Schilling2013-08-151-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11775
| | | * [ticket/11775] Split test into multiple stepsJoas Schilling2013-08-121-1/+25
| | | | | | | | | | | | | | | | PHPBB3-11775
| | | * [ticket/11775] Add functional test for moving the last postJoas Schilling2013-08-091-0/+43
| | | | | | | | | | | | | | | | PHPBB3-11775
| | | * [ticket/11775] Backport moving of the posting functions to 3.0Joas Schilling2013-08-082-101/+131
| | | | | | | | | | | | | | | | PHPBB3-11775
| * | | [ticket/11777] Fix new test for loop variables in extension template listenersrechosen2013-08-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the merge of https://github.com/phpbb/phpbb3/pull/1564 a new test has been added. Renamed and moved the template listener file of that test to comply with the new requirements. PHPBB3-11777
| * | | [ticket/11777] Require a suffix of '_listener' on extension template listenersrechosen2013-08-1210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To further mirror the file name and location requirements for php template event listeners, require extension template event listener files to follow the '<event name>_listener.html' naming format. PHPBB3-11777
| * | | [ticket/11777] Rename the extension template listener subdirectory to 'event/'rechosen2013-08-1210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per suggestion of EXreaction and nickvergessen, do not look for extension template event listeners in styles/[style]/template/events/ but in styles/[style]/template/event/ (without the trailing 's') to match the way phpBB looks for php template event listeners. PHPBB3-11777
| * | | [ticket/11777] Move the testing template events to 'events/' subdirectoriesrechosen2013-08-1210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests written for extension template events did not follow the convention and documentation of placing template event files in the events/ subdirectory. Moved the files to this subdirectory so the tests succeed again. PHPBB3-11777
| * | | Merge remote-tracking branch 'EXreaction/ticket/11701' into developJoas Schilling2013-08-0910-54/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11701: [ticket/11701] New line at EOF [ticket/11701] Test events in loops [ticket/11701] Refix regex for appending |length [ticket/11701] Fix regex for appending |length [ticket/11701] Fix loops var check [ticket/11701] Remove useless str_replace [ticket/11701] Loop variables are not passed correctly to events
| | * | | [ticket/11701] New line at EOFNathaniel Guse2013-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| | * | | [ticket/11701] Test events in loopsNathaniel Guse2013-07-233-0/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| | * | | [ticket/11701] Fix loops var checkNathaniel Guse2013-07-237-54/+54
| | | | | | | | | | | | | | | | | | | | PHPBB3-11701
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| | * \ \ \ Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3033-215/+1458
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| | * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-1494-673/+4040
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (575 commits) [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php [ticket/11696] Move file to new directory [ticket/11696] Rename constructor to __construct() [ticket/11696] Remove manual loading of db_tools in extension controller test [ticket/11696] Rename db_tools.php so it can be autoloaded [ticket/11698] Moving all autoloadable files to phpbb/ [ticket/11694] Do not locate assets with root path [ticket/11692] Don't update search_type in dev migration if already appended [ticket/11675] Fix template loop [ticket/11690] Old module class names may get autoloaded by class_exists [ticket/9649] Display information on index for moderators on unapproved posts [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11686] Not checking for phpBB Debug errors on functional tests [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting ... Conflicts: phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php
| | * | | | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| * | | | | | Merge remote-tracking branch 'asperous/ticket/11761' into developAndreas Fischer2013-08-061-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11761: [ticket/11761] Serve blank file locally in functional test
| | * | | | | | [ticket/11761] Serve blank file locally in functional testAndy Chase2013-08-061-3/+3
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example.org no longer serves blank responses, failing functional tests. this patch creates a blank file and serve it locally during the test, instead of hitting the http://example.org servers kindly provided by IANA. PHPBB3-11761
| * | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-031-0/+38
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/11762] Added call to test class's parent::setUp(). [ticket/11762] Fixed test's filename [ticket/11762] Use the === operator to distinguish "0" from ""
| | * | | | [ticket/11762] Added call to test class's parent::setUp().s9e2013-08-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added call to test class's parent::setUp(). Updated copyright year. PHPBB3-11762
| | * | | | [ticket/11762] Fixed test's filenames9e2013-08-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11762
| | * | | | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11762
* | | | | | [ticket/11628] Remove remaining style_path_provider_testNathaniel Guse2013-07-241-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
* | | | | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was set to default 'template/' to append template/ to all the paths, but every location was actually just setting it to '' to not append anything. So removed the option entirely (additional paths can be appended to the paths being sent to the function already) PHPBB3-11628
* | | | | | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was basically duplicating functionality. $names would be used if not empty, else array($name) would be used. Merged functionality into the first argument PHPBB3-11628
* | | | | | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-246-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11628
* | | | | | [ticket/11628] Remove style path providerNathaniel Guse2013-07-245-65/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-232-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11718: [ticket/11718] Quick test for fixes in ELSEIF [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF Conflicts: tests/template/template_test.php
| * | | | | [ticket/11718] Quick test for fixes in ELSEIFNathaniel Guse2013-07-192-1/+6
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-11718
* | | | | Merge remote-tracking branch 'asperous/ticket/11620' into developAndreas Fischer2013-07-2320-204/+1014
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * asperous/ticket/11620: (46 commits) [ticket/11620] Whitespace and combine function into test_case [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity [ticket/11620] Changed incorrect global variable [ticket/11620] Minor indentation changes and comment clarity [ticket/11620] Expected and actual test conditions wrongly swapped [ticket/11620] Space between . in directory import concatenation [ticket/11620] Changes to match merge [ticket/11620] Changes for code guidelines consistency [ticket/11620] Fix a static calls to non-static for session captcha [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick [ticket/11620] Update auth_provider for new interface [ticket/11620] Added garbage_collection_test [ticket/11620] Fixed check_ban_test errors with cache and ban warning message [ticket/11620] Fixed a typo on check_ban_test [ticket/11620] Refactored check_isvalid_test to use session_test_case [ticket/11615] Refactored isvalid test to be more imperative [ticket/11615] Rename continue -> check_isvalid for clarity [ticket/11620] Added a test for checking if users are banned [ticket/11620] Remove typo in beginning of session_key_test [ticket/11620] Typo in file name session_key_tests -> test ...
| * | | | | [ticket/11620] Whitespace and combine function into test_caseAndy Chase2013-07-227-39/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarityAndy Chase2013-07-221-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Changed incorrect global variableAndy Chase2013-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Minor indentation changes and comment clarityAndy Chase2013-07-222-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-2295-586/+3863
| |\ \ \ \ \
| * | | | | | [ticket/11620] Changes for code guidelines consistencyAndy Chase2013-07-223-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pickasperous2013-07-221-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Update auth_provider for new interfaceasperous2013-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Added garbage_collection_testasperous2013-07-222-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620
| * | | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning messageasperous2013-07-221-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11620