* develop-olympus:
[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
* 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
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11273:
[ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
Previously the string for selecting the correct classes was created
directly. Due to that a subsequent comma had to be removed. By joining the
array of class names with a separator this can be omitted.
PHPBB3-10954
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
* nickvergessen/ticket/11250:
[ticket/11250] Use user defined message as incomplete message
[ticket/11250] Add tests for simple nesting and code
[ticket/11250] Run tests by default and add an option for incomplete ones
[ticket/11250] Fix parsing result with special chars
[ticket/11250] Add tests for size and attachment
[ticket/11250] Fix method names
[ticket/11250] Add some comments and fix a description
[ticket/11250] Add some more tests for quotes
[ticket/11250] Move quote special cases from class to unit tests
[ticket/11250] Add parsing tests for our basic bbcodes in simple cases
It will now display a popup message for 3 seconds which will confirm the
taken action. The amount of DOM traversals have been significantly reduced
and jQuery.each is now used instead of for loops. Additionally, it is now
possible to click on the mark topics/forums read links without triggering
an AJAX error.
PHPBB3-10954
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
# 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
* develop-olympus: (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.
...
* 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.
...
* p/ticket/11015: (30 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/11015] Include functions.php because it is not always included.
[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/11015] Fix functional test case.
[ticket/11015] Change more docblocks.
[ticket/11015] Include dbms name in exception message.
[ticket/11015] Make phpbb_convert_30_dbms_to_31 more future proof
[ticket/11015] Move db driver class name fixing to function
[ticket/11015] Allow full dbms class name in tests/test_config.php
[ticket/11015] Allow full dbms class name in config.php
[ticket/11015] Remove strange method_exists call
[tracker/11015] Prepend phpbb_db_driver_ for PHPBB_TEST_DBMS
[ticket/11015] Re-introduce accidentally removed require in install_convert
...
* upstream/develop:
[ticket/11262] Add .lock in cache directory to .gitignore
[ticket/11265] Add assertions for board installation success.
[ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
[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
