mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/16549] Fix tests

Browse Source 
PHPBB3-16549
This commit is contained in:
rxu
2020-08-10 15:02:25 +07:00
parent 342301a1fc
commit 3df19411b4
43 changed files with 351 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -721,7 +721,14 @@ class phpbb_functional_test_case extends phpbb_test_case
$db = $this->get_db();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->createMock('\phpbb\user');
$user = $this->createMock('\phpbb\user', array(), array(
new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
'\phpbb\datetime'
));
$user->data['user_id'] = 2; // admin
$user->ip = '';
$auth = $this->createMock('\phpbb\auth\auth');
$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
@@ -755,7 +762,14 @@ class phpbb_functional_test_case extends phpbb_test_case
$db = $this->get_db();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$user = $this->createMock('\phpbb\user');
$user = $this->createMock('\phpbb\user', array(), array(
new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
'\phpbb\datetime'
));
$user->data['user_id'] = 2; // admin
$user->ip = '';
$auth = $this->createMock('\phpbb\auth\auth');
$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);

21
tests/test_framework/phpbb_test_case_helpers.php
View File

@@ -531,6 +531,14 @@ class phpbb_test_case_helpers
if ($container->has('user'))
{
$user = $container->get('user');
// Set default required user data if not set
$user->data['is_bot'] = $user->data['is_bot'] ?? false;
$user->data['is_registered'] = $user->data['is_registered'] ?? false;
$user->data['style_id'] = $user->data['style_id'] ?? 1;
$user->data['user_id'] = $user->data['user_id'] ?? ANONYMOUS;
$user->data['user_options'] = $user->data['user_options'] ?? 230271;
$user->style['style_id'] = $user->style['style_id'] ?? 1;
}
else
{
@@ -545,6 +553,14 @@ class phpbb_test_case_helpers
->method('format_date')
->will($this->test_case->returnCallback(__CLASS__ . '::format_date'));
// Set default required user data
$user->data['is_bot'] = false;
$user->data['is_registered'] = false;
$user->data['style_id'] = 1;
$user->data['user_id'] = ANONYMOUS;
$user->data['user_options'] = 230271;
$user->style['style_id'] = 1;
$user->date_format = 'Y-m-d H:i:s';
$user->optionset('viewcensors', true);
$user->optionset('viewflash', true);
@@ -555,11 +571,6 @@ class phpbb_test_case_helpers
}
$user->add_lang('common');
if (!isset($user->style))
{
$user->style = array('style_id' => 1);
}
// Create and register a quote_helper
$quote_helper = new \phpbb\textformatter\s9e\quote_helper(
$container->get('user'),