Commit graph

2856 commits

Author SHA1 Message Date
Oleg Pudeyev
0a29312d83 [feature/template-events] Chase dependency injection for template context.
PHPBB3-9550
2012-11-17 16:40:01 -05:00
Oleg Pudeyev
9a7c8721ce [feature/template-events] Adjust template events test to use the dataset.
PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
48adf8c5de [feature/template-events] Create a dataset for template event tests.
Having all files in one directory is too much of a mess.

PHPBB3-9550
2012-11-17 16:40:00 -05:00
Oleg Pudeyev
0df0c6199b [feature/template-events] Switch template event test to data providers.
PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
667f8d581f [feature/template-events] Add a universal template event test.
Also drop the irrelevant includejs code and add a simple
template event test. The simple test is not working yet however
due to the template engine not correctly tracking which template
it is rendering.

PHPBB3-9550
2012-11-17 16:39:59 -05:00
Oleg Pudeyev
f46f48a2cf [feature/template-events] Chase template/style renames and changes.
PHPBB3-9550
2012-11-17 16:39:58 -05:00
Vjacheslav Trushkin
db688c2574 [feature/template-events] Template events unit test
Adding template events test

PHPBB3-9550
2012-11-17 16:39:58 -05:00
Igor Wiedler
b5e069f879 Merge remote-tracking branch 'p/ticket/10933' into develop
* p/ticket/10933:
  [ticket/10933] Prose for get_first_file_location.
  [ticket/10933] Remaining documentation for added functions in resource locator
  [ticket/10933] Update template locator test to use style resource locator.
  [ticket/10933] Dispose of locate function in template class.
  [ticket/10933] Add mutators for template_path to style resource locator.
  [ticket/10933] Delete template_path assignment.
  [ticket/10933] Delete template_path from template class.
  [ticket/10933] Add get_first_template_location.
2012-11-17 19:49:03 +01:00
Igor Wiedler
5bc0f4b3d4 [ticket/11015] Move db driver class name fixing to function
PHPBB3-11015
2012-11-17 00:24:32 +01:00
David King
4efbb893b7 [feature/controller] Fix line endings and permissions, and check responses
PHPBB3-10864
2012-11-16 17:36:39 -05:00
David King
5b013ddf5c [feature/controller] Add controller functional test with template
PHPBB3-10864
2012-11-16 17:06:01 -05:00
David King
ba1acdca03 [feature/controller] Use warning instead of echo for copy() and unlink()
PHPBB3-10864
2012-11-16 17:06:00 -05:00
David King
0c75d3d7da [feature/controller] Add test for missing argument in controller class
PHPBB3-10864
2012-11-16 17:05:57 -05:00
David King
230897723c [feature/controller] Reword comment for clarification
PHPBB3-10864
2012-11-16 17:05:57 -05:00
David King
e516680859 [feature/controller] Use sizeof() instead of count() as per guidelines
PHPBB3-10864
2012-11-16 17:05:56 -05:00
David King
7691755883 [feature/controller] Adapt functional tests given new controller framework
PHPBB3-10864
2012-11-16 17:05:54 -05:00
David King
a87a5dd566 [feature/controller] Fix tests
PHPBB3-10864
2012-11-16 17:05:53 -05:00
David King
46cb0fb068 [feature/controller] Removed another empty construct method
PHPBB3-10864
2012-11-16 16:47:32 -05:00
David King
1c5a82c411 [feature/controller] Remove empty __construct() method
PHPBB3-10864
2012-11-16 16:47:27 -05:00
David King
79bcbd3691 [feature/controller] Add _controller attribute to Request after instantiation
PHPBB3-10864
2012-11-16 16:47:26 -05:00
David King
06158693c7 [feature/controller] Implement a front controller
PHPBB3-10864
2012-11-16 16:25:09 -05:00
Oleg Pudeyev
1a2dfa6d4c Merge PR #1074 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
2012-11-16 10:29:22 -05:00
Oleg Pudeyev
af5d8b502e Merge PR #1074 branch 'bantu/ticket/11192' into develop-olympus
* bantu/ticket/11192:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
2012-11-16 10:25:06 -05:00
Andreas Fischer
8851f9589a [ticket/11192] Merge dataProvider arrays because the test is the same now.
PHPBB3-11192
2012-11-16 16:20:55 +01:00
Andreas Fischer
7cbd440e7a [ticket/11192] Mark negative byte numbers as unsupported.
PHPBB3-11192
2012-11-16 14:56:15 +01:00
Andreas Fischer
4e3a42f59f [ticket/11192] Test strings not converted to int/float before.
PHPBB3-11192
2012-11-16 14:56:15 +01:00
Andreas Fischer
09c8c58a5c [ticket/11192] Also test strings, e.g. sums returned by the database.
PHPBB3-11192
2012-11-16 08:00:12 +01:00
Andreas Fischer
b7ec639945 [ticket/11192] Also test powers of 10 / 1000.
PHPBB3-11192
2012-11-16 08:00:07 +01:00
Oleg Pudeyev
c15b98999e [ticket/11192] Add tests.
PHPBB3-11192
2012-11-15 23:57:55 -05:00
Igor Wiedler
8f8a7f7637 [ticket/11015] Allow full dbms class name in tests/test_config.php
PHPBB3-11015
2012-11-16 01:50:30 +01: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
Igor Wiedler
a23eebdb7b [tracker/11015] Prepend phpbb_db_driver_ for PHPBB_TEST_DBMS
PHPBB3-11015
2012-11-16 01:19:57 +01:00
Oleg Pudeyev
109a86520f Merge PR #1060 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:31:03 -05:00
Oleg Pudeyev
17a7c4821a Merge PR #1060 branch 'nickvergessen/ticket/11186' into develop-olympus
* nickvergessen/ticket/11186:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:00:39 -05:00
Andreas Fischer
3408662e16 Merge remote-tracking branch 'p/ticket/11202' into develop
* p/ticket/11202:
  [ticket/11202] Check response success before content assertions.
2012-11-15 21:43:33 +01:00
Oleg Pudeyev
8917b31e31 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 14:54:13 -05: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
Joas Schilling
4db6ded8f0 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [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/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11190-develop] Functional tests purge cache before running.
  [ticket/11190] Functional tests purge cache before running.
2012-11-15 18:21:38 +01:00
Oleg Pudeyev
7402520d2f Merge PR #1070 branch 'Fyorl/ticket/11190-develop' into develop
* Fyorl/ticket/11190-develop:
  [ticket/11190-develop] Functional tests purge cache before running.
2012-11-15 09:47:51 -05: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
dc61fd1091 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 08:25:14 -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
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
2012-11-14 11:33:24 -06:00
Joas Schilling
79eea0ccac [ticket/10411] Use DIC to get the groupposition classes
PHPBB3-10411
2012-11-14 15:31:16 +01:00
Joas Schilling
eac1c46588 [ticket/10411] Fix missing functions in unit tests
PHPBB3-10411
2012-11-14 02:01:17 +01:00
Joas Schilling
ff7465e75f [ticket/10411] New class interface and unit tests for legend and teampage
PHPBB3-10411
2012-11-13 11:22:30 +01:00
Igor Wiedler
0fd3bb170b [ticket/11015] Fixup some things from the big merge
PHPBB3-11015
2012-11-12 11:16:39 +01:00
Igor Wiedler
bf641a7f31 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (31 commits)
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11152] Basic tests for the container functions
  [ticket/11152] Compile the install container
  [ticket/11152] Throw error if services.yml is missing
  [ticket/11152] Remove old container processor calls
  [ticket/11152] Use realpath in container extensions consistently
  [ticket/11152] Rename collection to collection_pass
  [ticket/11152] Remove @api docblocks
  [ticket/11152] Create separate function for debug-dependent container
  [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
  [ticket/11152] Convert cron_task_collection to generic di_service_collection
  [ticket/11152] Use relative root path in container, one dumped container per path
  [ticket/11152] Move container functions to a separate function file
  [feature/compiled-dic] Rename $phpEx to $php_ext in new code
  [feature/compiled-dic] Use an absolute path for core.root_path parameter
  [feature/compiled-dic] Update the composer.lock file
  [feature/compiled-dic] Purge cache to make ext services available right away
  [feature/compiled-dic] Fix root path when container is created after install
  [feature/compiled-dic] Remove old test
  ...
2012-11-12 10:46:21 +01:00