Commit graph

2108 commits

Author SHA1 Message Date
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
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
Nathan Guse
d64eb0e575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (21) and others
# Via Andreas Fischer (7) and others
* 'develop' of github.com:phpbb/phpbb3: (56 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/10491] Make recreate_database static.
  [ticket/11088] Pass required objects in as arguments
  ...

Conflicts:
	phpBB/install/database_update.php
2012-12-13 19:21:29 -06:00
Nathan Guse
8e6f9b38fb Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103
# By Oleg Pudeyev (42) and others
# Via David King (2) and others
* 'ticket/11103' of github.com:EXreaction/phpbb3: (58 commits)
  [ticket/11103] Revert changes to constants.php from my IDE
  [ticket/11243] Show download all link on all pages of topic with attachments
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Pass arguments in correct order.
  [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
  [feature/template-events] Order extensions in mock extension manager.
  [feature/template-events] Changes per imkingdavid's review.
  [feature/template-events] Make style names private on template.
  [feature/template-events] Test for event that is defined in parent style only.
  [feature/template-events] Specify style names, add inheritance tests.
  [feature/template-events] Normalize expected directory trees.
  [feature/template-events] Allow dataset to be correctly selectable.
  [feature/template-events] Dataset for template event testing with inheritance.
  ...
2012-12-13 19:19:57 -06:00
Nathan Guse
249f3c8885 [ticket/11103] Instantiate $phpbb_notifications as needed
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
2012-12-13 19:19:40 -06:00
Oleg Pudeyev
9e3fd3bf8e [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.
PHPBB3-11015
2012-12-13 19:15:24 -05:00
Oleg Pudeyev
1774dd2af4 [ticket/11015] Installer still needs 3.0-style dbms name.
PHPBB3-11015
2012-12-13 17:49:30 -05:00
Oleg Pudeyev
2d5ba0ebd7 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* 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
2012-12-13 17:43:57 -05:00
Andreas Fischer
93222cf396 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11265] Add assertions for board installation success.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-12-13 23:42:39 +01:00
Oleg Pudeyev
586e8cbd97 [ticket/11015] Include functions.php because it is not always included.
PHPBB3-11015
2012-12-13 15:46:13 -05:00
Oleg Pudeyev
789c04b900 [ticket/11265] Add assertions for board installation success.
PHPBB3-11265
2012-12-13 15:42:00 -05:00
Oleg Pudeyev
83345d986d [ticket/11015] Convert database drivers to new spelling in post setup sync.
PHPBB3-11015
2012-12-13 08:11:10 -05:00
Oleg Pudeyev
f5c745d2c5 [ticket/11015] Convert connect test to the new syntax.
PHPBB3-11015
2012-12-13 08:09:32 -05:00
Oleg Pudeyev
aae7a81270 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (101 commits)
  [ticket/10491] Make recreate_database static.
  [ticket/11088] Pass required objects in as arguments
  [ticket/11088] Globalize objects in new permission function
  [ticket/11088] Move permission creation to a function
  [ticket/11088] Copy a_styles permission for a_extensions
  [ticket/11088] Remove extraneous word from sentence in comment
  [ticket/11088] Changed "file extensions" to "attachment extensions"
  [ticket/11088] Fix the database updater to correctly manipulate the modules
  [ticket/11088] Put language pack module move below extension module creation
  [ticket/11088] Untested, progress on update script
  [ticket/11088] Fix typo (period instead of comma)
  [ticket/11088] Untested progress for update script
  [ticket/11088] Added missing comma
  [ticket/11088] Removed added space
  [ticket/11088] Move style, extension and language pack management to customise
  [ticket/11243] Show download all link on all pages of topic with attachments
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Pass arguments in correct order.
  [ticket/10491] Install board once per test run.
  [ticket/11257] Do not require set_name() method to exist
  ...
2012-12-13 07:56:40 -05:00
Oleg Pudeyev
326b6eb857 [ticket/10975] Add a test for viewing a profile.
PHPBB3-10975
2012-12-13 07:41:24 -05:00
Oleg Pudeyev
b42a228312 [ticket/10975] Test restricting by first character.
PHPBB3-10975
2012-12-13 07:33:02 -05:00
Oleg Pudeyev
4de07338ef [ticket/10975] Avoid rewriting global config twice.
PHPBB3-10975
2012-12-13 07:30:00 -05:00
Oleg Pudeyev
c5f350906d [ticket/10975] Test memberlist, not user creation.
PHPBB3-10975
2012-12-13 07:27:40 -05:00
Fyorl
2d5bd24fde [ticket/10975] Some quick tests to check the memberlist behaviour
Checks behaviour when adding and deleting a user.

PHPBB3-10975
2012-12-13 07:22:45 -05:00
Oleg Pudeyev
0916dc14ef Merge PR #1119 branch 'develop-olympus' into develop
While merging into develop, also move self::$config['table_prefix']
initialization into setup before class from install_board, as
install_board is only called to install the board and not for each test case.

* develop-olympus:
  [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.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-12-13 03:39:47 -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
Nathaniel Guse
7ae5b62fc6 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-12-12 16:30:50 -06:00
Joas Schilling
f4bc9c1673 [ticket/10714] Fix dependency injections in unit tests with mocks
PHPBB3-10714
2012-12-11 10:24:49 +01:00
David King
a9db155c28 Merge remote-tracking branch 'p/feature/template-events' into develop
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Order extensions in mock extension manager.
  [feature/template-events] Changes per imkingdavid's review.
  [feature/template-events] Make style names private on template.
  [feature/template-events] Test for event that is defined in parent style only.
  [feature/template-events] Specify style names, add inheritance tests.
  [feature/template-events] Normalize expected directory trees.
  [feature/template-events] Allow dataset to be correctly selectable.
  [feature/template-events] Dataset for template event testing with inheritance.
  [feature/template-events] Use style names array in template filter.
  [feature/template-events] Generate style names array in set_style.
  [feature/template-events] Convert a single style name to array of them.
  [feature/template-events] Chase dependency injection for template context.
  [feature/template-events] Adjust template events test to use the dataset.
  [feature/template-events] Create a dataset for template event tests.
  [feature/template-events] Indentation fix.
  [feature/template-events] Cosmetic changes.
  [feature/template-events] Wording: wrongly -> improperly.
  [feature/template-events] Indentation fix.
  [feature/template-events] Rename template_name to style_name.
  ...
2012-12-10 14:09:10 -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
eaa0319867 Merge PR #1125 branch 'develop-olympus' into develop
* develop-olympus:
  [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

Conflicts:
	tests/mock/cache.php
	tests/test_framework/phpbb_functional_test_case.php
2012-12-10 06:25:51 -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
Marc Alexander
1aae72961a Merge branch 'develop' into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2012-12-09 21:02:31 +01:00
Nathan Guse
84284a9cce [ticket/11103] Use scope: prototype
This lets us clean up the mess that was in load_object(), but requires
scope: prototype to be added to the service definitions for all types
or methods!

PHPBB3-11103
2012-12-09 13:43:06 -06:00
Nathan Guse
357a4facf6 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/includes/functions.php
2012-12-09 13:24:43 -06:00
Nathan Guse
37565f37e4 [ticket/11103] Some improvements to the user loader
PHPBB3-11103
2012-12-08 18:40:41 -06:00
Nathan Guse
6b7443adac [ticket/11103] User loader test.bat
PHPBB3-11103
2012-12-08 13:41:44 -06:00
Andreas Fischer
bd987b6e14 Merge remote-tracking branch 'p/ticket/11095-develop' into develop
* p/ticket/11095-develop:
  [ticket/11095] Restore brace on previous line.
  [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
  [ticket/11095] Forward GET parameters into hidden fields for jumpbox.
  [ticket/11095] Python quoteattr port.
  [ticket/11095] Use get method in jumpboxes.
2012-12-08 16:14:42 +01:00
Andreas Fischer
f043b14f79 Merge remote-tracking branch 'p/ticket/11255' into develop
* p/ticket/11255:
  [ticket/11255] Change search tests to use mock cache.
  [ticket/11255] Fix dbal write sequence test to run standalone.
2012-12-08 14:11:34 +01:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06:00
Oleg Pudeyev
03d2c6413c [ticket/11248] Convert line endings to LF - develop edition.
PHPBB3-11248
2012-12-07 21:57:33 -05:00
Andreas Fischer
b7b8fefdd0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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.

Conflicts:
	tests/fixtures/empty.xml
2012-12-08 03:08:21 +01: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
Oleg Pudeyev
5af3d14af3 [ticket/11255] Change search tests to use mock cache.
PHPBB3-11255
2012-12-07 15:32:26 -05:00
Oleg Pudeyev
5b368dd53a [ticket/11255] Fix dbal write sequence test to run standalone.
PHPBB3-11255
2012-12-07 15:32:06 -05: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
Joas Schilling
0f94ff9138 [ticket/10714] Add global variables for the unit tests
PHPBB3-10714
2012-12-07 16:05:57 +01:00
Joas Schilling
37530abd39 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (645 commits)
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
  [ticket/11219] Coding guidelines and naming consistency changes
  [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
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  ...
2012-12-07 15:50:24 +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