aboutsummaryrefslogtreecommitdiffstats
path: root/tests/mock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-06-112-0/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data() Conflicts: tests/mock/cache.php
| * [ticket/11579] Add remaining unit tests for validate_data functionsMarc Alexander2013-05-302-0/+28
| | | | | | | | | | | | | | | | This now includes tests for usernames, passwords, emails, and jabber addresses. A few small changes had to be applied to phpbb_mock_cache and phpbb_mock_user in order to incorporate needed methods. PHPBB3-11579
* | [ticket/develop/11543] Use plurals in developJoas Schilling2013-06-061-0/+5
| | | | | | | | PHPBB3-11543
* | Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-201-69/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11413: (23 commits) [ticket/11413] Revert some cache service related changes from earlier [ticket/11413] Use phpbb_user in test [ticket/11413] $user should have been $this->user [ticket/11413] Fix unit tests [ticket/11413] Translate the error [ticket/11413] Rename file to something more helpful [ticket/11413] Remove remaining irrelevant code to this PR [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR) [ticket/11413] Remove conversion of user_notifications [ticket/11413] Correct copyright year [ticket/11413] Remove changes for ticket 11420 from this branch [ticket/11413] Include mock class [ticket/11413] Don't use the database for the convert test [ticket/11413] Test get_notification_type_id and _ids functions [ticket/11413] Use sql_insert_buffer [ticket/11413] Create test for notification conversion [ticket/11413] Fix test fixtures and tests [ticket/11413] Fix some more tests [ticket/11413] Fix notification tests [ticket/11413] Prevent recursive function calls ...
| * | [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)Nathaniel Guse2013-05-031-21/+0
| | | | | | | | | | | | PHPBB3-11413
| * | [ticket/11413] Include mock classNathaniel Guse2013-04-301-0/+21
| | | | | | | | | | | | PHPBB3-11413
| * | [ticket/11413] Fix notification testsNathaniel Guse2013-04-291-69/+0
| | | | | | | | | | | | | | | | | | | | | Send types/methods the cache service, not the driver (not sure why the driver was sent before) PHPBB3-11413
* | | [ticket/11450] Move mocked class into mock/metadata_manager.phpJoas Schilling2013-05-081-0/+21
|/ / | | | | | | PHPBB3-11450
* | [ticket/11335] (tests) Make php_ext 'php' not '.php'Nathan Guse2013-04-241-1/+1
| | | | | | | | PHPBB3-11335
* | [ticket/11362] Extension manager depends on filesystemJoas Schilling2013-04-171-0/+1
| | | | | | | | PHPBB3-11362
* | [ticket/11103] Fix some various issues, better commentsNathan Guse2013-01-151-2/+2
| | | | | | | | PHPBB3-11103
* | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-152-30/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (37) and others # Via Oleg Pudeyev (24) and others * 'develop' of github.com:phpbb/phpbb3: (179 commits) [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [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/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/10805] Compare phpbbAlertTimer against null [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. ... Conflicts: phpBB/install/schemas/firebird_schema.sql phpBB/install/schemas/mssql_schema.sql phpBB/install/schemas/mysql_40_schema.sql phpBB/install/schemas/mysql_41_schema.sql phpBB/install/schemas/oracle_schema.sql phpBB/install/schemas/postgres_schema.sql phpBB/install/schemas/sqlite_schema.sql phpBB/styles/subsilver2/template/overall_footer.html
| * | [ticket/11037] Eliminate global $db usage in cache drivers.Oleg Pudeyev2012-12-201-1/+5
| | | | | | | | | | | | | | | | | | | | | The only time $db is needed in cache drivers is to navigate the result set in sql_save. Pass it as a parameter in that function. PHPBB3-11037
| * | [ticket/10763] Make functions for remote avatars staticMarc Alexander2012-12-171-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | fileupload::image_types() and filespec::get_extension() are called statically while submitting the form for the remote avatar. Make them static as described in the ticket in order to prevent a PHP notice. Also change the tests to use the static functions. PHPBB3-10763
* | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2012-12-122-0/+79
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-0/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| | * | [feature/template-events] Order extensions in mock extension manager.Oleg Pudeyev2012-11-271-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9550
| | * | [feature/template-events] Allow dataset to be correctly selectable.Oleg Pudeyev2012-11-171-0/+31
| | | | | | | | | | | | | | | | PHPBB3-9550
| * | | Merge PR #1125 branch 'develop-olympus' into developOleg Pudeyev2012-12-101-0/+47
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users Conflicts: tests/mock/cache.php tests/test_framework/phpbb_functional_test_case.php
| | * | [ticket/10972] Add destroy method to mock cache.Oleg Pudeyev2012-12-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I actually needed the version that destroys tables, therefore I ended up writing a mock null cache. This code is currently unused but will probably be handy at some point. PHPBB3-10972
| | * | [ticket/10972] Add mock null cache.Oleg Pudeyev2012-12-061-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mock cache has instrumentation methods and therefore is non-trivial to implement. For those times when we don't care that the cache caches, null cache is a simpler implementation. PHPBB3-10972
* | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-071-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | Merge PR #974 branch 'bantu/ticket/10875' into developOleg Pudeyev2012-11-301-0/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10875: [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible. [ticket/10875] Test for null cache driver and sql cache. [ticket/10875] Revise sql cache test. [ticket/10875] Must return query result on failure. [ticket/10875] More documentation. [ticket/10875] Spelling fix. [ticket/10875] Add docblocks for phpbb_cache_driver_interface [ticket/10875] Add comment about cache's sql_load() method. [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save(). [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result. [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save(). [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
| | * | [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.Andreas Fischer2012-10-301-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10875
* | | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-202-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a very basic user loader class to handle querying/storing user data in a centralized location. Use DIC collection service for notification types/methods. Cleanup unused dependencies. Fix some other issues. PHPBB3-11103
* | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-11-141-0/+160
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/config/services.yml
| * | | Merge pull request #1056 from igorw/feature/compiled-dicNils Adermann2012-11-111-0/+160
| |\ \ \ | | | | | | | | | | [feature/compiled-dic] Compile the DI Container into a cached class
| | * | | [feature/compiled-dic] Compile the DI Container into a cached classDavid King2012-11-101-0/+160
| | |/ / | | | | | | | | | | | | PHPBB3-11152
* | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-111-1/+8
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-101-1/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10939: [ticket/10939] Added documentation for phpbb_request::file [ticket/10939] Added tests for phpbb_request::file [ticket/10939] Modified the default return for $request->file [ticket/10939] Modified fileupload tests to deal with new behaviour [ticket/10939] Modified mock request class to handle deactivated $_FILES [ticket/10939] Modified acp_groups.php to not use $_FILES [ticket/10939] Modified ucp_groups.php to not use $_FILES [ticket/10939] Modified functions_user.php to not use $_FILES [ticket/10939] Modified message_parser.php to not use $_FILES [ticket/10939] Modified functions_upload to not use $_FILES [ticket/10939] Modified request test slightly to include $_FILES [ticket/10939] Added $_FILES handling to phpbb_request
| | * | [ticket/10939] Modified mock request class to handle deactivated $_FILESFyorl2012-08-151-1/+8
| | | | | | | | | | | | | | | | PHPBB3-10939
* | | | [ticket/11103] Set basic notifications to be enabled by defaultNathan Guse2012-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, if there is no row for the user in the user_notifications table, the user will receive basic notifications. If the user wishes to not receive notifications, a row must be added with notify = 0. For other methods besides the basic (e.g. email, jabber) a row must still be added with notify = 1 for them to receive notifications PHPBB3-11103
* | | | [ticket/11103] Correct the test caseNathan Guse2012-10-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix a bug that broke it and make sure to set the needed config/auth settings PHPBB3-11103
* | | | [ticket/11103] Brackets on their own linesNathan Guse2012-10-181-9/+27
| | | | | | | | | | | | | | | | PHPBB3-11103
* | | | [ticket/11103] More extensive notification testsNathan Guse2012-10-051-0/+35
| | | | | | | | | | | | | | | | PHPBB3-11103
* | | | [ticket/11103] Mock notification managerNathan Guse2012-10-041-0/+76
|/ / / | | | | | | | | | | | | | | | Fixing delete_user_pms_test.php PHPBB3-11103
* | | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-201-0/+16
|\ \ \ | |/ / |/| |
| * | [feature/php-events] Add mock for unit tests and create it were neededJoas Schilling2012-08-111-0/+16
| | | | | | | | | | | | PHPBB3-9550
* | | [ticket/10875] Return $query_id from sql_saveNathan Guse2012-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Have to return the $query_id from sql_save so that the results can be pulled Updated cache test to do some basic sql cache testing. PHPBB3-10875
* | | [ticket/11012] Fix php_ext change in mock_extension_managerIgor Wiedler2012-07-211-1/+1
|/ / | | | | | | PHPBB3-11012
* | [ticket/10941] Added some comments for clarificationFyorl2012-07-091-0/+7
| | | | | | | | PHPBB3-10941
* | [ticket/10941] Unit tests for fileupload class addedFyorl2012-07-081-0/+32
| | | | | | | | PHPBB3-10941
* | [ticket/10941] Finished filespec testsFyorl2012-07-081-0/+22
| | | | | | | | PHPBB3-10941
* | [ticket/10941] Unit tests for filespec classFyorl2012-07-081-0/+23
| | | | | | | | PHPBB3-10941
* | Merge branch 'develop-olympus' into developNils Adermann2012-07-081-0/+36
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php Conflicts: tests/bbcode/url_bbcode_test.php
| * [ticket/10974] Rename tests/mock_user.php -> tests/mock/user.phpAndreas Fischer2012-07-081-0/+36
| | | | | | | | PHPBB3-10974
* | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-311-2/+1
| | | | | | | | PHPBB-10609
* | [ticket/9916] Updating license in non-distributed filesUnknown2012-01-023-3/+3
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-022-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * [ticket/9916] Updating License in the headerUnknown2012-01-022-2/+2
| | | | | | | | PHPBB3-9916