Commit graph

14958 commits

Author SHA1 Message Date
Oleg Pudeyev
12bc77d034 [ticket/11015] Change more docblocks to phpbb_db_driver.
PHPBB3-11015
2012-12-13 18:00:12 -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
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
196bde21c4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11262] Add .lock in cache directory to .gitignore
2012-12-13 23:27:09 +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
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
Andreas Fischer
28fb9ed080 Merge remote-tracking branch 'EXreaction/ticket/11263' into develop
* EXreaction/ticket/11263:
  [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
2012-12-13 20:34:31 +01:00
Nathan Guse
ec074eb97c [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
$extension_manager should be $phpbb_extension_manager

PHPBB3-11263
2012-12-13 13:10:26 -06:00
Igor Wiedler
155937807a Merge pull request #19 from p/ticket/11015
Ticket/11015
2012-12-13 08:52:53 -08:00
Andreas Fischer
86e4a3ddfd Merge remote-tracking branch 'p/ticket/10975' into develop
* p/ticket/10975:
  [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 15:56:08 +01: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
10ee54d028 [ticket/11015] Restore whitespace to avoid conflict when merging develop.
PHPBB3-11015
2012-12-13 07:56:23 -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
1441b70ae8 [ticket/10491] Make recreate_database static.
PHPBB3-10491
2012-12-12 21:47:48 -05:00
Oleg Pudeyev
5da78cae09 Merge PR #985 branch 'imkingdavid/ticket/11088' into develop
* imkingdavid/ticket/11088:
  [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
2012-12-12 21:01:20 -05:00
David King
a5783211c9 [ticket/11088] Pass required objects in as arguments
PHPBB3-11088
2012-12-12 20:19:06 -05:00
David King
5fc6752178 [ticket/11088] Globalize objects in new permission function
PHPBB3-11088
2012-12-12 20:04:20 -05:00
David King
13f8e64a33 [ticket/11088] Move permission creation to a function
PHPBB3-11088
2012-12-12 20:01:58 -05:00
David King
8e4c1526fc [ticket/11088] Copy a_styles permission for a_extensions
PHPBB3-11088
2012-12-12 19:39:48 -05:00
David King
61adfa5026 [ticket/11088] Remove extraneous word from sentence in comment
PHPBB3-11088
2012-12-12 19:37:39 -05:00
David King
6dc89d6e31 [ticket/11088] Changed "file extensions" to "attachment extensions"
PHPBB3-11088
2012-12-12 19:36:52 -05:00
David King
70aea6fd7c [ticket/11088] Fix the database updater to correctly manipulate the modules
PHPBB3-11088
2012-12-12 12:48:27 -05:00
David King
80f68c358f [ticket/11088] Put language pack module move below extension module creation
PHPBB3-11088
2012-12-12 11:40:47 -05:00
David King
30c64f6a01 [ticket/11088] Untested, progress on update script
This should rename Styles category to Customise, move language packs, and add extension management

PHPBB3-11088
2012-12-12 11:40:46 -05:00
David King
72d1a210de [ticket/11088] Fix typo (period instead of comma)
PHPBB3-11088
2012-12-12 11:40:43 -05:00
David King
e58c6536f0 [ticket/11088] Untested progress for update script
PHPBB3-11088
2012-12-12 11:39:17 -05:00
David King
e2aef2bfd1 [ticket/11088] Added missing comma
PHPBB3-11088
2012-12-12 11:39:16 -05:00
David King
f7d9b15a97 [ticket/11088] Removed added space
PHPBB3-11088
2012-12-12 11:39:15 -05:00
David King
4980d8b011 [ticket/11088] Move style, extension and language pack management to customise
Instead of being separated, these related ACP modules are now grouped
intuitively.

PHPBB3-11088
2012-12-12 11:39:14 -05:00
Nathan Guse
9420647c43 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11243' into develop 2012-12-11 12:24:28 -06:00
David King
53c4a328a6 [ticket/11243] Show download all link on all pages of topic with attachments
PHPBB3-11243
2012-12-11 11:42:34 -05:00
David King
2212294ba3 Merge remote-tracking branch 'p/feature/template-events' into develop
* p/feature/template-events:
  [feature/template-events] Pass arguments in correct order.

Conflicts:
	phpBB/includes/style/style.php
2012-12-10 14:27:18 -05: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
a0211ff2eb [feature/template-events] Pass arguments in correct order.
Thank you imkingdavid.

PHPBB3-9550
2012-12-10 14:02:57 -05:00
Oleg Pudeyev
0446886f91 [feature/template-events] Pass arguments in correct order.
Thank you imkingdavid.

PHPBB3-9550
2012-12-10 13:35:15 -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