aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/11561' into developDhruv2013-06-181-0/+8
|\ | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11561: [ticket/11561] Specify used tables in notification fixture, so they are emptied
| * [ticket/11561] Specify used tables in notification fixture, so they are emptiedJoas Schilling2013-06-181-0/+8
| | | | | | | | PHPBB3-11561
* | Merge branch 'develop' into ticket/10820-developDhruv2013-06-1315-31/+926
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (10) and Joas Schilling (2) # Via Andreas Fischer (3) and Joas Schilling (1) * develop: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions [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()
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-1114-0/+918
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * \ Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-1114-0/+918
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11579: [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()
| | | * | [ticket/11579] Add method for validating emails for valid MX and mark as slowMarc Alexander2013-06-051-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A method for setting up the prerequisities also has been added in order to reduce the amount of necessary code. PHPBB3-11579
| | | * | [ticket/11579] Do not extend validate_data_helperMarc Alexander2013-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11579
| | | * | [ticket/11579] Add missing commas to validate_username_testMarc Alexander2013-06-031-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11579
| | | * | [ticket/11579] Rework calls to validate_data_helperMarc Alexander2013-06-0310-232/+344
| | | | | | | | | | | | | | | | | | | | PHPBB3-11579
| | | * | [ticket/11579] Move simple tests into seperate filesMarc Alexander2013-06-037-251/+366
| | | | | | | | | | | | | | | | | | | | PHPBB3-11579
| | | * | [ticket/11579] Use test case helper class and use assert prefix for methodMarc Alexander2013-06-035-95/+100
| | | | | | | | | | | | | | | | | | | | PHPBB3-11579
| | | * | [ticket/11579] Move tests into seperate files depending on needed fixtureMarc Alexander2013-05-308-499/+594
| | | | | | | | | | | | | | | | | | | | PHPBB3-11579
| | | * | [ticket/11579] Add remaining unit tests for validate_data functionsMarc Alexander2013-05-304-62/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/11579] Add basic set of unit tests for validate_data()Marc Alexander2013-05-291-0/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently includes tests for the string, num, date, match, and language iso validation functions. PHPBB3-11579
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11605' into developAndreas Fischer2013-06-111-31/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11605: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions
| | * | | | [ticket/11605] Remove unused copied_files propertyJoas Schilling2013-06-111-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11605
| | * | | | [ticket/11605] Use empty_dir to better delete files and dirs of extensionsJoas Schilling2013-06-111-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11605
* | | | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-1382-344/+3667
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (146) and others # Via Andreas Fischer (50) and others * develop: (356 commits) [ticket/11599] Copy the forums into a static array for later reuse [ticket/11602] Do not call localize_errors() if avatars are disabled [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php [ticket/11543] Add more users so #hidden <> #normal [ticket/11590] Close database connections when tearDown() is called [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count() [ticket/11481] Move prepended slash from calls into function ...
| * | | | | [ticket/11599] Copy the forums into a static array for later reuseJoas Schilling2013-06-111-17/+42
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11599
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-112-3/+39
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympusAndreas Fischer2013-06-112-3/+39
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11601: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| | | * | | [ticket/11601] Add protected method for database sync and call itJoas Schilling2013-06-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11601
| | | * | | [ticket/11601] Split post_setup_synchronisation logic from xml parsingJoas Schilling2013-06-111-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11601
| | * | | | Merge remote-tracking branch 'remotes/nickv/ticket/11543' into develop-olympusNathaniel Guse2013-06-072-0/+359
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11543: [ticket/11543] Add more users so #hidden <> #normal [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11550' into developAndreas Fischer2013-06-116-194/+88
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11550: [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
| | * | | | | [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-116-40/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-086-159/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Move functionality for copying/restoring to test case helpersJoas Schilling2013-06-081-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550
| | * | | | | [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.phpJoas Schilling2013-06-081-1/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-11550
| * | | | | Merge remote-tracking branch 'remotes/nickv/ticket/develop/11543' into developNathaniel Guse2013-06-073-0/+353
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/develop/11543: [ticket/11543] Add more users so #hidden <> #normal [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| | * | | | Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-072-10/+21
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11543: [ticket/11543] Add more users so #hidden <> #normal Conflicts: tests/functions/obtain_online_test.php
| | | * | | [ticket/11543] Add more users so #hidden <> #normalJoas Schilling2013-06-072-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | | [ticket/develop/11543] Use plurals in developJoas Schilling2013-06-062-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | * | | | Merge branch 'ticket/11543' into ticket/develop/11543Joas Schilling2013-06-062-0/+348
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11543: [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count()
| | | * | | [ticket/11543] Use correct IP addresses and inject time for correct valuesJoas Schilling2013-06-061-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | | * | | [ticket/11543] Add unit tests for obtain_users_online_string()Joas Schilling2013-06-062-1/+185
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | | * | | [ticket/11543] Add unit tests for obtain_users_online() with empty forumJoas Schilling2013-06-061-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | | * | | [ticket/11543] Add unit tests for obtain_users_online()Joas Schilling2013-06-061-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11543
| | | * | | [ticket/11543] Add unit tests for obtain_guest_count()Joas Schilling2013-06-062-0/+80
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-11543
| * | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-06-061-0/+20
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling (1) and Nils Adermann (1) * remotes/upstream/develop-olympus: [ticket/11590] Close database connections when tearDown() is called
| | * | | [ticket/11590] Close database connections when tearDown() is calledJoas Schilling2013-06-071-0/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-11590
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-06-079-13/+361
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-043-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3113-81/+94
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Split status code and html debug assertion into two methodsJoas Schilling2013-05-311-18/+30
| | | | | | | | | | | | | | | | | | | | PHPBB3-11568