Commit graph

2856 commits

Author SHA1 Message Date
Andreas Fischer
53c4257bfa Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Fix unit tests.
  [ticket/11037] Update services.yml.
  [ticket/11037] Add/update docblocks.
  [ticket/11037] Eliminate globals from cache service.
2012-12-31 01:11:19 +01:00
Oleg Pudeyev
9c7772040c [ticket/11037] Fix unit tests.
PHPBB3-11037
2012-12-29 14:23:14 -05:00
Marc Alexander
ea6bf00977 [feature/avatars] Improve testing to also check for enabled drivers
PHPBB3-10018
2012-12-27 20:39:02 +01:00
Oleg Pudeyev
ca7327ba26 [ticket/11294] Update required/optional extension list for develop.
PHPBB3-11294
2012-12-27 01:10:58 -05:00
Nathaniel Guse
148463d586 [ticket/11103] Remove global $db usage in test
PHPBB3-11103
2012-12-26 11:05:12 -06:00
Andreas Fischer
3f03dd7ecd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11294] Capitalize phpunit.
  [ticket/11294] Update required/optional extension list for olympus.
2012-12-26 16:45:21 +01:00
Oleg Pudeyev
bc797c7da2 [ticket/11294] Capitalize phpunit.
PHPBB3-11294
2012-12-26 10:41:13 -05:00
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
cb7f6deb07 Merge remote-tracking branch 'p/ticket/10758' into develop
* p/ticket/10758:
  [ticket/10758] Add return to the other compat function.
  [ticket/10758] Add periods.
  [ticket/10758] Yes, only one empty line.
  [ticket/10758] Add deprecated tags.
  [ticket/10758] Add compat functions.
  [ticket/10758] Admin is not working yet.
  [ticket/10758] Test moderator and admin permissions.
  [ticket/10758] Check that acl was changed in the test.
  [ticket/10758] Extract obtain_user_data for the benefit of tests.
  [ticket/10758] Functional test for changing a user's permission.
  [ticket/10758] Spelling fix.
  [ticket/10758] Add a test for acp login.
  [ticket/10758] Dependency inject parameters into update_foes.
  [ticket/10758] Dependency inject parameters into cache_moderators.
2012-12-25 15:18:47 +01:00
Oleg Pudeyev
c0b3151f0d [ticket/11294] Update required/optional extension list for olympus.
PHPBB3-11294
2012-12-25 07:23:46 -05:00
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01:00
Andreas Fischer
7829d2a8c8 Merge remote-tracking branch 'p/ticket/10758-upload' into develop
* p/ticket/10758-upload:
  [ticket/10758-upload] Mark tests that don't work incomplete.
  [ticket/10758-upload] Convert error to a failure.
2012-12-22 23:38:05 +01:00
Andreas Fischer
7f0fa6477f Merge remote-tracking branch 'p/ticket/11248' into develop
* p/ticket/11248:
  [ticket/11248] Convert line endings to LF - develop edition.
2012-12-22 23:25:54 +01:00
Andreas Fischer
4b808e2671 Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Eliminate global $db usage in cache drivers.
2012-12-22 23:21:19 +01:00
Oleg Pudeyev
cc0f6d471f [ticket/10758-upload] Mark tests that don't work incomplete.
PHPBB3-10758
2012-12-21 01:45:24 -05:00
Oleg Pudeyev
b6f40f7c33 [ticket/10758-upload] Convert error to a failure.
PHPBB3-10758
2012-12-20 20:42:06 -05:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
2012-12-20 22:51:38 +01:00
Andreas Fischer
d118295676 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11285] Use more granularity in dependency checks in compress test
2012-12-20 21:56:10 +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
Oleg Pudeyev
e50f69187f [ticket/11037] Eliminate global $db usage in cache drivers.
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
2012-12-20 04:35:30 -05:00
Oleg Pudeyev
f9cee47003 [ticket/10758] Admin is not working yet.
PHPBB3-10758
2012-12-19 21:50:35 -05:00
Oleg Pudeyev
3327a4676c [ticket/10758] Test moderator and admin permissions.
PHPBB3-10758
2012-12-19 21:50:35 -05:00
Oleg Pudeyev
ac3e69cb08 [ticket/10758] Check that acl was changed in the test.
PHPBB3-10758
2012-12-19 21:50:35 -05:00
Oleg Pudeyev
3af5531d0d Merge PR #1147 branch 'marc1706/ticket/10763' into develop
* marc1706/ticket/10763:
  [ticket/10763] Use self when calling get_extension() in filespec class
  [ticket/10763] Make functions for remote avatars static
2012-12-18 04:11:56 -05:00
Marc Alexander
54d96dfac7 [ticket/10763] Make functions for remote avatars static
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
2012-12-17 17:42:13 +01:00
Oleg Pudeyev
da2f0757d7 Merge PR #1140 branch 'develop-olympus' into develop
* 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
2012-12-16 16:48:15 -05:00
Nathan Guse
eeb4018195 [ticket/11103] data -> notification_data
PHPBB3-11103
2012-12-15 22:08:10 -06:00
Nathan Guse
fad6bc5a7e [ticket/11103] unread -> notification_read
PHPBB3-11103
2012-12-15 22:06:32 -06:00
Nathan Guse
47bed33216 [ticket/11103] time -> notification_time
PHPBB3-11103
2012-12-15 22:02:16 -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
Oleg Pudeyev
7b9092ea3b [ticket/10758] Functional test for changing a user's permission.
PHPBB3-10758
2012-12-15 16:50:28 -05:00
Oleg Pudeyev
ff83580af1 [ticket/10758] Add a test for acp login.
PHPBB3-10758
2012-12-15 16:50:28 -05:00
Nathan Guse
7cf673f0db Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (20) and others
# Via Andreas Fischer (3) and Oleg Pudeyev (2)
* 'develop' of github.com:phpbb/phpbb3: (33 commits)
  [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
  [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
  [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.
  ...
2012-12-15 10:18:38 -06:00
Oleg Pudeyev
d1eb3449af [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
PHPBB3-11268
2012-12-14 14:05:46 -05:00
Joas Schilling
be8140d79c Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (158 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/11262] Add .lock in cache directory to .gitignore
  [ticket/11015] Include functions.php because it is not always included.
  [ticket/11265] Add assertions for board installation success.
  [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
  [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/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
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  ...
2012-12-14 18:45:04 +01:00
Joas Schilling
ebe1f5d8da [ticket/11250] Use user defined message as incomplete message
PHPBB3-11250
2012-12-14 18:31:12 +01:00
Joas Schilling
4f080ba0d6 [ticket/11250] Add tests for simple nesting and code
PHPBB3-11250
2012-12-14 14:29:11 +01:00
Joas Schilling
8bbf3a788f [ticket/11250] Run tests by default and add an option for incomplete ones
PHPBB3-11250
2012-12-14 13:59:48 +01:00
Joas Schilling
1e5da1417a [ticket/11250] Fix parsing result with special chars
: . and [ are replaced by their html representation if they are text only

PHPBB3-11250
2012-12-14 13:58:39 +01:00
Joas Schilling
cce821f99d [ticket/11250] Add tests for size and attachment
PHPBB3-11250
2012-12-14 13:09:56 +01:00
Joas Schilling
bf312b5293 [ticket/11250] Fix method names
PHPBB3-11250
2012-12-14 13:04:44 +01:00
Joas Schilling
90a81a064b [ticket/11250] Add some comments and fix a description
PHPBB3-11250
2012-12-14 13:03:10 +01:00
Joas Schilling
deceeb7373 [ticket/11250] Add some more tests for quotes
PHPBB3-11250
2012-12-14 13:00:14 +01:00
Joas Schilling
ade9f831aa [ticket/11250] Move quote special cases from class to unit tests
PHPBB3-11250
2012-12-14 12:58:57 +01:00
Joas Schilling
754dc9c159 [ticket/11250] Add parsing tests for our basic bbcodes in simple cases
PHPBB3-11250
2012-12-14 12:56:42 +01: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
d68778e7eb [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
PHPBB3-8323
2012-12-13 20:05:00 -06:00
Andreas Fischer
6e25b4231e Merge branch 'develop-olympus' into develop
* 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.
  ...
2012-12-14 02:56:20 +01: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