diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-02 17:12:43 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-02 17:12:43 -0500 |
| commit | e08edd36b9f18b9206ea327bcfb45e4331630d1b (patch) | |
| tree | 4f3b5d9aca26191bb65695f1b800cf21be51075f /tests/test_framework | |
| parent | 9fca8f88fa533c9f8cae80ec5d92f2961006e982 (diff) | |
| parent | 91be99822312d9a83ae4f6849eef864dfd47e4a1 (diff) | |
| download | forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.gz forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.bz2 forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.xz forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11386' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index b570b464e6..3b9629b9f8 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -138,16 +138,29 @@ class phpbb_functional_test_case extends phpbb_test_case $db = $this->get_db(); $db_tools = new phpbb_db_tools($db); - return new phpbb_extension_manager( + $extension_manager = new phpbb_extension_manager( new phpbb_mock_container_builder(), $db, $config, - new phpbb_db_migrator($config, $db, $db_tools, self::$config['table_prefix'] . 'migrations', $phpbb_root_path, $php_ext, self::$config['table_prefix'], array()), self::$config['table_prefix'] . 'ext', dirname(__FILE__) . '/', '.' . $php_ext, $this->get_cache_driver() ); + $migrator = new phpbb_db_migrator( + $config, + $db, + $db_tools, + self::$config['table_prefix'] . 'migrations', + $phpbb_root_path, + $php_ext, + self::$config['table_prefix'], + array() + ); + $extension_manager->set_migrator($migrator); + $migrator->set_extension_manager($extension_manager); + + return $extension_manager; } static protected function install_board() |