1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 14:00:59 +02:00

72 Commits

Author SHA1 Message Date
Igor Wiedler
0483971f77 [ticket/11305] Mock container for cache driver in functional create_user()
create_user has calls to fetch the cache driver from the container. This
PR mocks the container and returns a null cache driver in that case.

PHPBB3-11305
2013-01-02 21:44:25 +01: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
b6f40f7c33 [ticket/10758-upload] Convert error to a failure.
PHPBB3-10758
2012-12-20 20:42:06 -05:00
Oleg Pudeyev
ff83580af1 [ticket/10758] Add a test for acp login.
PHPBB3-10758
2012-12-15 16:50:28 -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
789c04b900 [ticket/11265] Add assertions for board installation success.
PHPBB3-11265
2012-12-13 15:42:00 -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
4de07338ef [ticket/10975] Avoid rewriting global config twice.
PHPBB3-10975
2012-12-13 07:30:00 -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
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
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
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
38d2868ba8 [ticket/10491] Move board installation into setup before class.
Functional posting test already assumed that board is installed
once per test case and not once per test.

PHPBB3-10491
2012-12-04 17:37:46 -05:00
Oleg Pudeyev
bdc3ddf2bc [ticket/10491] Set up functional tests sensibly.
PHPBB_FUNCTIONAL_URL goes into setup before class.

Drop PHPBB_FUNCTIONAL_URL check in board installation and
silent return if it is not set.

Take board installation out of constructor.

Install board in setup method.

PHPBB3-10491
2012-12-04 17:19:25 -05:00
Oleg Pudeyev
74093d0fd3 [ticket/11015] Fix functional test case.
PHPBB3-11015
2012-12-04 04:32:37 -05:00
Igor Wiedler
423c79e106 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (22 commits)
  [ticket/11206] Remove includes to non-existent files from download/file.php
  [ticket/11205] Fix merge conflict in readme.html.
  [ticket/11202] Check response success before content assertions.
  [ticket/11204] Reindent.
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
  [ticket/11200] Make cache available during container construction
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
  [ticket/11199] Cache purge does not remove dumped container
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
  [ticket/10879] Remove arrow icon from attachment link in editor
  [ticket/11195] Condense logic, remove improperly formatted if()
  [ticket/11190-develop] Functional tests purge cache before running.
  ...

Conflicts:
	tests/test_framework/phpbb_database_test_connection_manager.php
2012-11-16 01:23:24 +01:00
Oleg Pudeyev
ec06d5c5d9 [ticket/11204] Reindent.
PHPBB3-11204
2012-11-15 14:52:53 -05:00
Andreas Fischer
b9e1caa81a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-11-15 20:24:37 +01:00
Andreas Fischer
14a42a97a8 Merge remote-tracking branch 'p/ticket/11202-olympus' into develop-olympus
* p/ticket/11202-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
2012-11-15 19:48:46 +01:00
Oleg Pudeyev
af7ab2d3ac [ticket/11202] Custom message does not make sense here, delete it.
PHPBB3-11202
2012-11-15 08:40:29 -05:00
Oleg Pudeyev
4ab178f3ef [ticket/11202] Add a heuristic function to check for response success.
This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
2012-11-15 08:24:27 -05:00
Igor Wiedler
5e52216b5e Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (666 commits)
  [ticket/11077] Remove code from old global announcements system
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
  [ticket/11187] Added a blank array to fix errors in functional tests
  [ticket/10780] Make L_COLON available in the installer.
  [ticket/11183] Remove $load_extensions and weird dl() calls
  [ticket/10970] Added extra documentation to parse_dynamic_path.
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  ...

Conflicts:
	phpBB/common.php
	phpBB/download/file.php
	phpBB/includes/db/dbal.php
	phpBB/includes/db/firebird.php
	phpBB/includes/db/mssql.php
	phpBB/includes/db/mssql_odbc.php
	phpBB/includes/db/mssqlnative.php
	phpBB/includes/db/mysql.php
	phpBB/includes/db/mysqli.php
	phpBB/includes/db/oracle.php
	phpBB/includes/db/postgres.php
	phpBB/includes/db/sqlite.php
	phpBB/includes/extension/manager.php
	phpBB/install/database_update.php
2012-11-12 10:33:40 +01:00
Fyorl
db0cc74af0 [ticket/11190-develop] Functional tests purge cache before running.
PHPBB3-11190
2012-11-11 10:53:44 +00:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running.
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
2012-11-11 10:44:47 +00:00
Andreas Fischer
3f933c6870 Merge remote-tracking branch 'Fyorl/ticket/11187' into develop
* Fyorl/ticket/11187:
  [ticket/11187] Added a blank array to fix errors in functional tests
2012-11-10 14:58:03 +01:00
Fyorl
c73293d826 [ticket/11187] Added a blank array to fix errors in functional tests
PHPBB3-11187
2012-11-10 13:46:40 +00:00
Igor Wiedler
195014867a [ticket/11183] Remove $load_extensions and weird dl() calls
PHPBB3-11183
2012-11-10 11:25:22 +01:00
Unknown Bliss
79da1ea592 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631
Conflicts:
	phpBB/common.php
	phpBB/download/file.php
2012-09-01 21:15:39 +01:00
Nils Adermann
4fde4abe55 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
2012-09-01 17:06:59 +02:00
David King
4dd1bbc587 [task/functional] Fixed DEBUG_TEST related issues
PHPBB3-10758
2012-09-01 10:53:01 -04:00
Nathan Guse
36465c9a20 [ticket/10631] Functional acp_extensions test, cleanup
PHPBB3-10631
2012-09-01 15:05:49 +01:00
Nathan Guse
fd5ed30052 [ticket/10631] Update tests
PHPBB3-10631
2012-09-01 15:05:38 +01:00
Andreas Fischer
17681c0770 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11034] Re-arranged install order to emulate real install
2012-07-30 19:03:20 +02:00
Fyorl
647d395908 [ticket/11034] Re-arranged install order to emulate real install
PHPBB3-11034
2012-07-30 14:13:28 +01:00
Igor Wiedler
90a957ad26 [ticket/11015] Make DBAL classes autoloadable
PHPBB3-11015

This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
2012-07-21 18:11:14 +02:00
Andreas Fischer
db7b879b82 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
2012-07-19 16:59:45 +02:00
Fyorl
7a412f846a [ticket/10981] Removed setupBeforeClass
PHPBB3-10981
2012-07-17 21:39:48 +01:00
Fyorl
d88411e10d [ticket/10981] Modified functional framework to account for goutte changes
PHPBB3-10981
2012-07-16 17:52:03 +01:00
Fyorl
797ee16eaf [ticket/10981] Added goutte via composer
composer.phar added and autoloaded before tests

PHPBB3-10981
2012-07-16 17:52:03 +01:00
Nils Adermann
6956a6eb00 Merge branch 'develop-olympus' into develop
By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
  [task/functional] Use proper format for @var doc blocks.
  [task/functional] Fix $lang_path variable
  [task/functional] Change property visibility, remove globals, reword comment
  [task/functional] Make sure missing language values are handled properly
  [task/functional] Increase code coverage for functional tests

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-05-22 18:11:08 +02:00
David King
09d15db1fa [task/functional] Use proper format for @var doc blocks.
PHPBB3-10758
2012-05-22 12:06:27 -03:00