diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-02 12:55:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-12-02 19:50:09 +0100 |
| commit | 087bf6fd35913152129eed97005953ac3979002a (patch) | |
| tree | e3f7626a46a4819e4831fd46a84d88d76d3d7b76 /tests/functions_content/phpbb_format_quote_test.php | |
| parent | fc27dc02b42e3afa98e96bdab0daf752c6cb9ccf (diff) | |
| download | forums-087bf6fd35913152129eed97005953ac3979002a.tar forums-087bf6fd35913152129eed97005953ac3979002a.tar.gz forums-087bf6fd35913152129eed97005953ac3979002a.tar.bz2 forums-087bf6fd35913152129eed97005953ac3979002a.tar.xz forums-087bf6fd35913152129eed97005953ac3979002a.zip | |
[ticket/15893] Pass needed language class directly to format quote
PHPBB3-15893
Diffstat (limited to 'tests/functions_content/phpbb_format_quote_test.php')
| -rw-r--r-- | tests/functions_content/phpbb_format_quote_test.php | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/functions_content/phpbb_format_quote_test.php b/tests/functions_content/phpbb_format_quote_test.php index 0f6136f5d9..cbbd46d0a9 100644 --- a/tests/functions_content/phpbb_format_quote_test.php +++ b/tests/functions_content/phpbb_format_quote_test.php @@ -15,13 +15,16 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php'; class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case { + /** @var \phpbb\language\language */ + protected $lang; + public function setUp() { global $cache, $user, $phpbb_root_path, $phpEx; $lang_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_file_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->lang = new \phpbb\language\language($lang_file_loader); + $user = new \phpbb\user($this->lang, '\phpbb\datetime'); $cache = new phpbb_mock_cache(); parent::setUp(); @@ -30,8 +33,10 @@ class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case public function data_phpbb_format_quote() { return [ - [true, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', "[quote=admin user_id=2][quote="username"]quoted[/quote][/quote]\n\n"], - [false, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', "admin wrote:\n> [quote="username"]quoted[/quote]\n"] + [true, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', '', "[quote=admin user_id=2][quote="username"]quoted[/quote][/quote]\n\n"], + [false, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', '', "admin wrote:\n> [quote="username"]quoted[/quote]\n"], + [true, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', "[url=http://viewtopic.php?p=1#p1]Subject: Foo[/url]\n\n", "[url=http://viewtopic.php?p=1#p1]Subject: Foo[/url]\n\n[quote=admin user_id=2][quote="username"]quoted[/quote][/quote]\n\n"], + [false, ['author' => 'admin', 'user_id' => 2], '[quote="username"]quoted[/quote]', "http://viewtopic.php?p=1#p1 - Subject: Foo\n\n", "http://viewtopic.php?p=1#p1 - Subject: Foo\n\nadmin wrote:\n> [quote="username"]quoted[/quote]\n"], ]; } @@ -39,13 +44,13 @@ class phpbb_functions_content_phpbb_format_quote_test extends phpbb_test_case /** * @dataProvider data_phpbb_format_quote */ - public function test_phpbb_format_quote($bbcode_status, $quote_attributes, $message, $expected) + public function test_phpbb_format_quote($bbcode_status, $quote_attributes, $message, $message_link, $expected) { $text_formatter_utils = new \phpbb\textformatter\s9e\utils(); $message_parser = new parse_message($message); - phpbb_format_quote($bbcode_status, $quote_attributes, $text_formatter_utils, $message_parser); + phpbb_format_quote($this->lang, $message_parser, $text_formatter_utils, $bbcode_status, $quote_attributes, $message_link); $this->assertEquals($expected, $message_parser->message); } |