aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11457] Remove check and include for set_var function. It's not used.Andreas Fischer2013-03-171-5/+0
| | | | PHPBB3-11457
* Merge remote-tracking branch 'nickvergessen/ticket/11443' into developAndreas Fischer2013-03-162-1/+6
|\ | | | | | | | | | | * nickvergessen/ticket/11443: [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object [ticket/11443] Add _test suffix to migration test filenames
| * [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log objectJoas Schilling2013-03-161-1/+6
| | | | | | | | PHPBB3-11443
| * [ticket/11443] Add _test suffix to migration test filenamesJoas Schilling2013-03-152-0/+0
| | | | | | | | PHPBB3-11443
* | Merge remote-tracking branch 'bantu/ticket/11441' into developJoas Schilling2013-03-152-49/+63
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11441: [ticket/11441] Split user loader tests into multiple test methods. [ticket/11441] Use setUp() in phpbb_user_loader_test. [ticket/11441] Update/correct copyright year of user loader test. [ticket/11441] Correct/fix class name of user loader test. [ticket/11441] Add _test prefix to user loader test filename.
| * | [ticket/11441] Split user loader tests into multiple test methods.Andreas Fischer2013-03-151-2/+9
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Use setUp() in phpbb_user_loader_test.Andreas Fischer2013-03-151-10/+17
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Update/correct copyright year of user loader test.Andreas Fischer2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Correct/fix class name of user loader test.Andreas Fischer2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Add _test prefix to user loader test filename.Andreas Fischer2013-03-151-0/+0
| | | | | | | | | | | | PHPBB3-11441
* | | [ticket/11439] Add _test suffix to notification test filename.Andreas Fischer2013-03-151-0/+0
|/ / | | | | | | PHPBB3-11439
* | Merge remote-tracking branch 'remotes/Marc/ticket/11404' into developNathan Guse2013-03-121-90/+160
|\ \ | |/ |/| | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11404: [ticket/11404] Remove version ID from manager_test.php file header [ticket/11404] Add tests for phpbb_avatar_manager::clean_row() [ticket/11404] Convert manager_test to UNIX line endings [ticket/11404] Use a default data row if $row is empty in clean_row() [ticket/11404] Return empty array of avatar data if $row is empty
| * [ticket/11404] Remove version ID from manager_test.php file headerMarc Alexander2013-03-111-1/+0
| | | | | | | | PHPBB3-11404
| * [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()Marc Alexander2013-03-111-0/+71
| | | | | | | | PHPBB3-11404
| * [ticket/11404] Convert manager_test to UNIX line endingsMarc Alexander2013-03-111-90/+90
| | | | | | | | PHPBB3-11404
* | Merge remote-tracking branch 'remotes/marc/ticket/11323' into developNathaniel Guse2013-03-091-3/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11323: [ticket/11323] Reduce additional code and revert regex to previous one [ticket/11323] Enable tests for inclusion of defined variables [ticket/11323] Correctly treat variables in template defines
| * | [ticket/11323] Enable tests for inclusion of defined variablesMarc Alexander2013-02-191-3/+0
| | | | | | | | | | | | PHPBB3-11323
* | | [ticket/10202] Rename method names _all() to _array().Andreas Fischer2013-03-051-11/+11
| | | | | | | | | | | | PHPBB3-10202
* | | [ticket/10202] Add tests for phpbb_config_db_text.Andreas Fischer2013-03-052-0/+134
| |/ |/| | | | | PHPBB3-10202
* | Merge remote-tracking branch 'remotes/nickv/ticket/10714' into developNathaniel Guse2013-03-046-1/+808
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/10714: (56 commits) [ticket/10714] Get log from container in install, update and download/file [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10714] Update add_log docs block with @param and @deprecated [ticket/10714] Remove fallback code from previous commits and move global [ticket/10714] Fix missing parameter and global phpbb_log in unit tests [ticket/10714] Add getter for is_in_admin and use it [ticket/10714] Fix more comments [ticket/10714] Cast values to integer before using them in the query [ticket/10714] Fix several doc blocks and comments [ticket/10714] Fix missing 8th argument in unit tests [ticket/10714] Use new core.adm_relative_path to create the object. [ticket/10714] Fix several comments and variable names [ticket/10714] Fix database driver class name [ticket/10714] Forgot most important, use container to create $phpbb_log [ticket/10714] Remove type hinting to allow the usage of mocks in tests [ticket/10714] Fix dependency injections in unit tests with mocks [ticket/10714] Use dependencies instead of globals [ticket/10714] Compare log_type to false, rather then null [ticket/10714] Add global variables for the unit tests ...
| * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-03-0415-12/+837
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (255 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-02-2519-28/+1118
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (119 commits) [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated [ticket/11358] Changed the name of post parameter. [ticket/11358] Changed the action parameter value to represent the link. [ticket/11358] Enabled link making all users default for a group. [ticket/11358] Removed redundant code and referred proper variable. [ticket/11358] Success message even without selecting a user. [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected. [ticket/10896] Add missing email validation lost in develop merge [ticket/7262] Add note about set_config() not updating is_dynamic. [ticket/7262] Add $is_dynamic example to set_config() and set_config_count(). [ticket/7262] Backport set_config() and set_config_count() docs from develop. [ticket/11122] Move rxu to 'Former Contributors' section. [ticket/11122] Add EXreaction to docs/AUTHORS. [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION [ticket/11361] Make sure that array passed to strtr() has the proper format. [ticket/11179] remove extra & in function call [ticket/11179] correct start parameter in sphinx search [ticket/11179] correct start parameter in native author search [ticket/11179] correct start parameter in native keyword search ... Conflicts: phpBB/config/tables.yml
| * | | | [ticket/10714] Fix missing parameter and global phpbb_log in unit testsJoas Schilling2013-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-222-0/+277
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11329] Moving colors to colours.css [ticket/9492] Fix missing phpbb_container in unit tests [ticket/9492] Fix typo in SQL query [ticket/9492] Ensure to delete the avatar/rank data when we change it [ticket/9492] Ensure to update all avatar values when the avatar is changed [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar [ticket/9492] Add unit tests for custom ranks and avatars [ticket/9492] Retain custom ranks and avatars when setting users default group [ticket/11328] Replace long buttons text with short text [ticket/11328] Add language variables for buttons
| * | | | | [ticket/10714] Fix more commentsJoas Schilling2013-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | [ticket/10714] Fix missing 8th argument in unit testsJoas Schilling2013-01-223-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-1619-173/+648
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (205 commits) [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/11201] Remove database column on update [ticket/10431] Remove .left class from reply-all [ticket/10431] Remove reply-all custom css [ticket/10431] Adjustments for large buttons [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11201] Remove MSN/WLM fields [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone ...
| * | | | | | [ticket/10714] Fix several comments and variable namesJoas Schilling2013-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-1444-90/+931
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (158 commits) [ticket/11015] Move comment in the right place. [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31 [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli. [ticket/11015] Change permission adding in database updater to new style. [ticket/11015] Change more docblocks to phpbb_db_driver. [ticket/11015] Installer still needs 3.0-style dbms name. [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11015] Include functions.php because it is not always included. [ticket/11265] Add assertions for board installation success. [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager [ticket/11015] Convert database drivers to new spelling in post setup sync. [ticket/11015] Convert connect test to the new syntax. [ticket/11015] Restore whitespace to avoid conflict when merging develop. [ticket/10975] Add a test for viewing a profile. [ticket/10975] Test restricting by first character. [ticket/10975] Avoid rewriting global config twice. [ticket/10975] Test memberlist, not user creation. [ticket/10975] Some quick tests to check the memberlist behaviour [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. ...
| * | | | | | | [ticket/10714] Fix dependency injections in unit tests with mocksJoas Schilling2012-12-113-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | [ticket/10714] Add global variables for the unit testsJoas Schilling2012-12-072-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2012-12-0797-361/+3085
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (645 commits) [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1 [ticket/10679] Use module_auth to limit access to the module [ticket/10679] Add new permission for changing profile field information [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. ...
| * | | | | | | | [ticket/10714] Fix unit test because of events and moved filesJoas Schilling2012-08-213-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | [ticket/10714] Refactor disable mechanism to only disable certain typesJoas Schilling2012-08-211-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only disable admin log when adding multiple users, so critical errors are still logged. PHPBB3-10714
| * | | | | | | | [ticket/10714] Add docblock for the test casesJoas Schilling2012-08-212-25/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | [ticket/10714] Add unit tests for view_log functionJoas Schilling2012-08-212-0/+507
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | [ticket/10714] Rename add_log_function testJoas Schilling2012-08-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | [ticket/10714] Serialize the log_data in the testinsteadof hardcoding itJoas Schilling2012-08-211-50/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | [ticket/10714] Add unit tests for log classJoas Schilling2012-08-211-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| * | | | | | | | [ticket/10714] Add unit tests for add_log functionJoas Schilling2012-08-212-0/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
* | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3Nathaniel Guse2013-03-048-291/+1274
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/db/migrator.php
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-043-0/+128
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (100) and others # Via Marc Alexander (8) and Igor Wiedler (3) * remotes/marc/feature/avatars: (138 commits) [feature/avatars] Update module_auth of ucp module and fix small issues [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [feature/avatars] Auto-clear avatar dimensions when first changing avatars [feature/avatars] Use "Main" as category for avatars in root of gallery [feature/avatars] Remove trailing whitespace from avatar code [feature/avatars] Pass phpbb_user to prepare and process form functions [feature/avatars] Document the use of the allowed extensions array [feature/avatars] Use array for allowed extensions and implode if needed [feature/avatars] Use deprecated for compatibility function [feature/avatars] Correct license, copyright and package info [feature/avatars] Move list of supported formats to avatar driver class [feature/avatars] Add include of functions_display.php in BC function [feature/avatars] Add note about when compatibility function was added [feature/avatars] Add compatibility function for get_user_avatar() [feature/avatars] Move definition of driver_collection to avatars.yml [feature/avatars] Remove the obsolete request argument for avatar drivers [feature/avatars] Add missing @var to docblocks in avatar manager [feature/avatars] Remove not needed inline style [feature/avatars] Differentiate tests for get drivers functions ...
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-0415-33/+871
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| | * | | | | | | | | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpbb_user object might be used for language variables and other things. PHPBB3-10018
| | * | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-0722-1/+1384
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| | * | | | | | | | | | [feature/avatars] Differentiate tests for get drivers functionsMarc Alexander2013-01-082-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for get_all_drivers() and get_enabled_drivers() should be different. PHPBB3-10018
| | * | | | | | | | | | [feature/avatars] Remove $request property and pass as argument if neededMarc Alexander2013-01-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the $request property from the phpbb_avatar_driver class and rather pass it as function argument if it's needed in a function. Currently this is only the case for the class methods prepare_form() and process_form(). PHPBB3-10018
| | * | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-046-9/+180
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_groups.php
| | * | | | | | | | | | | [feature/avatars] Improve testing to also check for enabled driversMarc Alexander2012-12-271-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10018
| | * | | | | | | | | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-2445-251/+1201
| | |\ \ \ \ \ \ \ \ \ \ \