[ticket/715] Resolve some more test issues

B3P-715
This commit is contained in:
Marc Alexander
2021-08-29 09:39:57 +02:00
parent d8bb1c64a4
commit d24316d809
7 changed files with 51 additions and 43 deletions

View File

@@ -43,7 +43,10 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
global $db, $cache, $phpbb_root_path, $phpEx, $user, $phpbb_container, $request, $template, $table_prefix;
global $phpbb_dispatcher;
$user = new \board3\portal\tests\mock\user();
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$user = new \board3\portal\tests\mock\user($this->language, '\phpbb\datetime');
$template = new \board3\portal\tests\mock\template($this);
$this->template = $template;
$request = new \phpbb_mock_request;
@@ -75,7 +78,8 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
$phpbb_container->setParameter('board3.portal.config.table', $table_prefix . 'portal_config');
$this->portal_columns = new \board3\portal\portal\columns();
$phpbb_container->set('board3.portal.columns', $this->portal_columns);
$cache = $this->getMockBuilder('\phpbb\cache\cache')
$cache = $this->getMockBuilder('\phpbb\cache\service')
->disableOriginalConstructor()
->setMethods(['destroy', 'sql_exists', 'get', 'put', 'sql_load', 'sql_save'])
->getMock();
$cache->expects($this->any())
@@ -124,9 +128,6 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
$phpEx
);
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$b3p_controller_helper = new \board3\portal\controller\helper(
new \phpbb\auth\auth(),
$this->portal_columns,