1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

11479 Commits

Author SHA1 Message Date
Oleg Pudeyev
02a1777fcb [ticket/11295] Drop tables rather than database for postgres in test suite.
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
2012-12-26 00:31:43 -05:00
Andreas Fischer
c701de695f [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.
This is so generated packages are not confused with the already-released
3.0.11 version.
2012-12-23 22:14:18 +01:00
Oleg Pudeyev
86f0c0a6d5 Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympus
* 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
2012-12-22 18:01:53 -05:00
Joas Schilling
68ffb106fb [ticket/11278] Comment out the code for dropping the Q&A tables
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
2012-12-21 16:05:05 +01:00
Andreas Fischer
e53f4e5eac Merge remote-tracking branch 'p/ticket/11285' into develop-olympus
* p/ticket/11285:
  [ticket/11285] Use more granularity in dependency checks in compress test
2012-12-20 21:51:18 +01:00
Oleg Pudeyev
00d8f944da [ticket/11285] Use more granularity in dependency checks in compress test
Some of the tests can be run without zlib or bz2 extensions present.

PHPBB3-11285
2012-12-20 13:20:05 -05:00
Andreas Fischer
dabe88bb3a Merge remote-tracking branch 'p/ticket/10880' into develop-olympus
* p/ticket/10880:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
2012-12-20 14:26:46 +01:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
Joas Schilling
f0c780a453 [ticket/11278] Fix not running queries from db tools in database update
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
2012-12-19 13:38:16 +01:00
Oleg Pudeyev
a288c4b66b Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympus
* 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
2012-12-16 16:24:48 -05:00
Nathan Guse
649e009f7b [ticket/8610] Update comment
PHPBB3-8610
2012-12-15 16:23:48 -06:00
Nathan Guse
175b6deb6d [ticket/8610] Do not use requests to submit posts except in posting_test.php
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
2012-12-15 16:22:54 -06:00
Nathan Guse
d739745ea4 [ticket/8610] Move posting helpers to separate file
This is to prevent cluttering up the functional test case class more

PHPBB3-8610
2012-12-13 23:09:45 -06:00
Nathan Guse
9eb9fa2b9d [ticket/8610] Create helper functions to create topic/post in functional tests
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
2012-12-13 22:38:17 -06:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/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
2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
PHPBB3-8610
2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase
PHPBB3-8610
2012-12-13 20:32:43 -06:00
Nathan Guse
71bcc58fee [ticket/8610] Add some comments
PHPBB3-8610
2012-12-13 20:23:04 -06:00
Nathaniel Guse
5a88bd1bf1 [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
2012-12-13 20:23:03 -06:00
Nathaniel Guse
05d7decdd3 [ticket/8610] Update Bookmarks when merging posts into another topic
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.

PHPBB3-8610
2012-12-13 20:19:27 -06:00
Nathaniel Guse
8dd2a151cc [ticket/8610] Update Bookmarks when forking topics
Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Nathaniel Guse
abcc59fca6 [ticket/8610] Update Bookmarks when merging topics
Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Andreas Fischer
f4df152b4b Merge remote-tracking branch 'p/ticket/11162' into develop-olympus
* 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.
  ...
2012-12-14 02:55:07 +01:00
Andreas Fischer
73e7fa8e8e Merge remote-tracking branch 'p/ticket/11265' into develop-olympus
* p/ticket/11265:
  [ticket/11265] Add assertions for board installation success.
2012-12-13 23:31:04 +01:00
Andreas Fischer
7611e11608 Merge remote-tracking branch 'EXreaction/ticket/11262' into develop-olympus
* EXreaction/ticket/11262:
  [ticket/11262] Add .lock in cache directory to .gitignore
2012-12-13 23:26:58 +01:00
Nathan Guse
845bf6a638 [ticket/11262] Add .lock in cache directory to .gitignore
PHPBB3-11262
2012-12-13 16:15:49 -06:00
Oleg Pudeyev
789c04b900 [ticket/11265] Add assertions for board installation success.
PHPBB3-11265
2012-12-13 15:42:00 -05:00
Oleg Pudeyev
a4e4841082 Merge PR #1119 branch 'p/ticket/10491' into develop-olympus
* 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.
2012-12-13 03:11:07 -05:00
Oleg Pudeyev
a686910958 [ticket/11162] Reformat.
PHPBB3-11162
2012-12-13 03:07:25 -05:00
Oleg Pudeyev
1441b70ae8 [ticket/10491] Make recreate_database static.
PHPBB3-10491
2012-12-12 21:47:48 -05:00
Oleg Pudeyev
e2c67a8e42 [ticket/11162] Rename tricky updates to database helper.
PHPBB3-11162
2012-12-12 21:46:38 -05:00
Oleg Pudeyev
2bc2cb1f6f [ticket/10491] Install board once per test run.
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
2012-12-10 06:42:43 -05:00
Oleg Pudeyev
3c542b852a Merge PR #1125 branch 'p/ticket/10972' into develop-olympus
* 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
2012-12-10 06:04:24 -05:00
Andreas Fischer
b5f94a14f1 Merge remote-tracking branch 'p/ticket/10205' into develop-olympus
* p/ticket/10205:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.
2012-12-08 03:04:05 +01:00
Igor Wiedler
a8deb7f87b Merge remote-tracking branch 'p/ticket/11248' into develop-olympus
* p/ticket/11248:
  [ticket/11248] Line endings to LF.
2012-12-07 19:09:12 +01:00
Oleg Pudeyev
ff993ba9d3 [ticket/10972] Drop user deletion.
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
2012-12-06 23:49:27 -05:00
Oleg Pudeyev
fb5c4440e5 [ticket/10972] Tweak user addition.
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
2012-12-06 23:45:17 -05:00
Oleg Pudeyev
1285bdff00 [ticket/10972] Add destroy method to mock cache.
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
2012-12-06 23:42:13 -05:00
Oleg Pudeyev
771bb957ab [ticket/10972] Add mock null cache.
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
2012-12-06 23:41:02 -05:00
Oleg Pudeyev
ebdd96592a [ticket/10972] Backport get_db from develop.
PHPBB3-10972
2012-12-06 22:45:12 -05:00
Fyorl
d33accb687 [ticket/10972] Added explicit checks for creating duplicate users.
PHPBB3-10972
2012-12-06 22:10:10 -05:00
Fyorl
cafc7feca1 [ticket/10972] Moved tests into appropriate places and added comments
PHPBB3-10972
2012-12-06 22:10:09 -05:00
Fyorl
7005002069 [ticket/10972] Added methods for creating and deleting basic users
Modified the login method to allow logging in of an arbitrary user.
Also added tests for the new functionality.

PHPBB3-10972
2012-12-06 22:10:09 -05:00
Oleg Pudeyev
18bcb9f804 Merge PR #1101 branch 'Noxwizard/ticket/11219' into develop-olympus
* Noxwizard/ticket/11219:
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/11219] Only update sequences that are affected by a fixture
  [ticket/11219] Recreate Oracle sequences instead of altering them
  [ticket/11219] Add unit test for inserting into a sequence column
  [ticket/11219] Update sequence values after loading fixtures
2012-12-06 01:16:55 -05:00
Patrick Webster
dbb54b217b [ticket/11219] Coding guidelines and naming consistency changes
PHPBB3-11219
2012-12-05 22:57:06 -06:00
Oleg Pudeyev
dc649ad3cd [ticket/11248] Line endings to LF.
PHPBB3-11248
2012-12-05 20:11:00 -05:00
Oleg Pudeyev
0f7cdfe9f4 Merge PR #1053 branch 'p/ticket/10841' into develop-olympus
* p/ticket/10841:
  [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
2012-12-05 12:15:27 -05:00
Oleg Pudeyev
a8e74f5292 [ticket/10841] Revert more whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Oleg Pudeyev
0793f8e2e6 [ticket/10841] Revert whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
120accb9d4 [ticket/10841] adding space after if
PHPBB3-10841
2012-12-05 12:07:37 -05:00