diff options
| author | David King <imkingdavid@gmail.com> | 2013-05-18 11:20:47 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-05-18 11:20:47 -0400 |
| commit | d8ed228ddf2f4117a5a8044e9903ef22febdeb4a (patch) | |
| tree | 67621e4f166aab54861003b4500133a28e7b3fdd /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 367b3dac8c910e7877139d4631e63e44f4f843f0 (diff) | |
| parent | 20815ed5a2032dbad628304d31a0c29b6eef3d4f (diff) | |
| download | forums-d8ed228ddf2f4117a5a8044e9903ef22febdeb4a.tar forums-d8ed228ddf2f4117a5a8044e9903ef22febdeb4a.tar.gz forums-d8ed228ddf2f4117a5a8044e9903ef22febdeb4a.tar.bz2 forums-d8ed228ddf2f4117a5a8044e9903ef22febdeb4a.tar.xz forums-d8ed228ddf2f4117a5a8044e9903ef22febdeb4a.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11415' into develop
* EXreaction/ticket/11415:
[ticket/11415] Add test for find_from_extension()
[ticket/11415] Send the extension base the finder rather than the manager
[ticket/11415] Create function in finder find_from_extension
[ticket/11415] Fix ext.manager constructor in tests
[ticket/11415] Make migrator/ext.manager dependencies of the base ext class
[ticket/11415] Remove migrator dependency from extension manager
[ticket/11415] Move migrator to base extension class from ext.manager
[ticket/11415] Move while loop from ext manager to acp_extensions.php
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index dae37f336d..660234f3ed 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -148,11 +148,13 @@ class phpbb_functional_test_case extends phpbb_test_case self::$config['table_prefix'], array() ); + $container = new phpbb_mock_container_builder(); + $container->set('migrator', $migrator); + $extension_manager = new phpbb_extension_manager( - new phpbb_mock_container_builder(), + $container, $db, $config, - $migrator, new phpbb_filesystem(), self::$config['table_prefix'] . 'ext', dirname(__FILE__) . '/', |