aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11295] Drop tables rather than database for postgres in test suite.Oleg Pudeyev2012-12-261-2/+25
| | | | | | | | | | Doing so allows: 1. User running the tests no longer needs create database privilege. 2. Test database may be located in a non-default tablespace and generally have site-specific options applied to it. PHPBB3-11295
* [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
| | | | | This is so generated packages are not confused with the already-released 3.0.11 version.
* Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
|\ | | | | | | | | | | * nickvergessen/ticket/11278: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update
| * [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on firebird. It was possible for board administrators to adjust the code to work. If code was manually adjusted by board administrators, index names would not be the same as what 3.0.9 and newer expect. This code fragment drops captcha tables, destroying all entered Q&A captcha configuration, such that when Q&A is configured next the respective tables will be created with corrent index names. If you wish to preserve your Q&A captcha configuration, you can manually rename indexes to the currently expected name: phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid Again, this needs to be done only if a board was manually modified to fix broken captcha code. PHPBB3-11278
| * [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
| | | | | | | | | | | | | | | | The db_tools class is running in return mode, which means that the queries are not run, but just returned. Therefor the broken tables were not removed from the database. PHPBB3-11278
* | Merge remote-tracking branch 'p/ticket/11285' into develop-olympusAndreas Fischer2012-12-201-7/+18
|\ \ | | | | | | | | | | | | * p/ticket/11285: [ticket/11285] Use more granularity in dependency checks in compress test
| * | [ticket/11285] Use more granularity in dependency checks in compress testOleg Pudeyev2012-12-201-7/+18
|/ / | | | | | | | | | | Some of the tests can be run without zlib or bz2 extensions present. PHPBB3-11285
* | Merge remote-tracking branch 'p/ticket/10880' into develop-olympusAndreas Fischer2012-12-202-5/+7
|\ \ | |/ |/| | | | | * p/ticket/10880: [ticket/10880] The m_approve permisson no longer implies f_noapprove.
| * [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-192-5/+7
|/ | | | PHPBB3-10880
* Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympusOleg Pudeyev2012-12-164-58/+168
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8610: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | PHPBB3-8610
| * [ticket/8610] Do not use requests to submit posts except in posting_test.phpNathan Guse2012-12-153-137/+108
| | | | | | | | | | | | | | | | Moving my functional test functions from posting_helpers.php to posting_test.php since it is a bit nicer and more reusable if posting_test.php is to be expanded in the future. PHPBB3-8610
| * [ticket/8610] Move posting helpers to separate fileNathan Guse2012-12-133-105/+137
| | | | | | | | | | | | This is to prevent cluttering up the functional test case class more PHPBB3-8610
| * [ticket/8610] Create helper functions to create topic/post in functional testsNathan Guse2012-12-132-78/+112
| | | | | | | | | | | | | | | | This will be used to test splitting/copying/merging/etc in functional tests Also convert functional posting_test.php to use these functions PHPBB3-8610
| * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-1312-45/+693
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [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 [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
* | Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-147-13/+516
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11162: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| * | [ticket/11162] Reformat.Oleg Pudeyev2012-12-131-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-127-4/+4
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-052-7/+8
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-053-10/+239
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] This test really only works for bookmarks.Oleg Pudeyev2012-12-043-3/+50
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] The test is not at all trivial.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-044-88/+104
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Clarify that only the two tables actually work.Oleg Pudeyev2012-12-011-0/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Uncomment transactions.Oleg Pudeyev2012-12-011-2/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] An implementation that actually works.Oleg Pudeyev2012-12-011-5/+68
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Make count function upper case.Andreas Fischer2012-11-111-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Rename count variable name to remaining_rows.Andreas Fischer2012-11-111-2/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use integer casting instead of SQL escape.Andreas Fischer2012-11-111-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-023-1/+150
| | | | | | | | | | | | PHPBB3-11162
* | | Merge remote-tracking branch 'p/ticket/11265' into develop-olympusAndreas Fischer2012-12-131-3/+11
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/11265: [ticket/11265] Add assertions for board installation success.
| * | | [ticket/11265] Add assertions for board installation success.Oleg Pudeyev2012-12-131-3/+11
| | | | | | | | | | | | | | | | PHPBB3-11265
* | | | Merge remote-tracking branch 'EXreaction/ticket/11262' into develop-olympusAndreas Fischer2012-12-131-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * EXreaction/ticket/11262: [ticket/11262] Add .lock in cache directory to .gitignore
| * | | [ticket/11262] Add .lock in cache directory to .gitignoreNathan Guse2012-12-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11262
* | | | Merge PR #1119 branch 'p/ticket/10491' into develop-olympusOleg Pudeyev2012-12-131-25/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10491: [ticket/10491] Make recreate_database static. [ticket/10491] Install board once per test run. [ticket/10491] Move board installation into setup before class. [ticket/10491] Set up functional tests sensibly.
| * | | | [ticket/10491] Make recreate_database static.Oleg Pudeyev2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10491
| * | | | [ticket/10491] Install board once per test run.Oleg Pudeyev2012-12-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is how things used to be. Installing for each test class brings 3-4x performance penalty compared to installing once for the entire test run. However, with a single installation for all tests an individual test can see different data when it is invoked by itself vs when it is executed as part of the entire test suite. PHPBB3-10491
| * | | | [ticket/10491] Move board installation into setup before class.Oleg Pudeyev2012-12-041-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functional posting test already assumed that board is installed once per test case and not once per test. PHPBB3-10491
| * | | | [ticket/10491] Set up functional tests sensibly.Oleg Pudeyev2012-12-041-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB_FUNCTIONAL_URL goes into setup before class. Drop PHPBB_FUNCTIONAL_URL check in board installation and silent return if it is not set. Take board installation out of constructor. Install board in setup method. PHPBB3-10491
* | | | | Merge PR #1125 branch 'p/ticket/10972' into develop-olympusOleg Pudeyev2012-12-104-3/+138
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10972: [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
| * | | | [ticket/10972] Drop user deletion.Oleg Pudeyev2012-12-062-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users should not be deleted in tests that test user creation. Tests should use unique user names to avoid collisions. User deletion should use user_remove anyway. PHPBB3-10972
| * | | | [ticket/10972] Tweak user addition.Oleg Pudeyev2012-12-062-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add users, do not keep track of which users have been added. The tests should know whether users they want exist or not. Use more unique user names in tests for robustness. Added some more assertions here and there. PHPBB3-10972