Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/715] Resolve some more test issues

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/controller/helper_test.php
View File

@@ -48,8 +48,11 @@ class helper_test extends \board3\portal\tests\testframework\test_case
$this->language_file_loader->set_extension_manager($phpbb_extension_manager);
$this->php_ext = 'php';
$this->portal_columns = new \board3\portal\portal\columns();
$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');
$this->modules = array(
'\board3\portal\modules\link_us' => new \board3\portal\modules\link_us($this->config, new \board3\portal\tests\mock\template($this), new \board3\portal\tests\mock\user),
'\board3\portal\modules\link_us' => new \board3\portal\modules\link_us($this->config, new \board3\portal\tests\mock\template($this), $user),
);
$this->portal_helper = new \board3\portal\includes\helper($this->modules);
$this->path_helper = new \phpbb\path_helper(
@@ -144,12 +147,16 @@ class helper_test extends \board3\portal\tests\testframework\test_case
public function test_load_module_language()
{
global $phpbb_root_path;
$this->assertNull($this->controller_helper->load_module_language($this->modules['\board3\portal\modules\link_us']));
$this->assertEquals('Link to us', $this->user->lang('LINK_US'));
$this->assertFalse(isset($this->user->lang['PORTAL_LEADERS_EXT']));
$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');
$module = $this->getMockBuilder('\board3\portal\modules\link_us')
->setMethods(['get_language'])
->setConstructorArgs([$this->config, new \board3\portal\tests\mock\template($this), new \board3\portal\tests\mock\user])
->setConstructorArgs([$this->config, new \board3\portal\tests\mock\template($this), $user])
->getMock();
$module->expects($this->any())
->method('get_language')
@@ -158,7 +165,7 @@ class helper_test extends \board3\portal\tests\testframework\test_case
'file' => 'modules/portal_leaders_module',
));
$this->assertNull($this->controller_helper->load_module_language($module));
$this->assertEquals('Team Settings', $this->user->lang('ACP_PORTAL_LEADERS'));
$this->assertNotEmpty($this->user->lang('ACP_PORTAL_LEADERS'));
}
public function data_assign_module_vars()

6
tests/unit/controller/main_test.php
View File

@@ -43,7 +43,9 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
$cache = new \phpbb\cache\driver\dummy();
$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');
$config_table = $table_prefix . 'portal_config';
$modules_table = $table_prefix . 'portal_modules';
@@ -61,8 +63,6 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
->method('acl_get')
->with($this->anything())
->will($this->returnValue(true));
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$controller_helper = new \board3\portal\controller\helper(
$auth,