tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Move link conversion to the end of BBCode::convert

Browse source 
- Addresses https://github.com/friendica/friendica/issues/7271
- Add related tests
This commit is contained in:
Hypolite Petovan 2019-06-15 22:24:51 -04:00
commit 38311a4a02
2 changed files with 348 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tests/src/Content/Text/BBCodeTest.php
View file

@ -134,4 +134,47 @@ class BBCodeTest extends MockedTest
$this->assertNotEquals($assert, $output);
}
}
public function dataBBCodes()
{
return [
'bug-7271-condensed-space' => [
'expectedHtml' => '<ul class="listdecimal" style="list-style-type: decimal;"><li> <a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
'text' => '[ol][*] http://example.com/[/ol]',
],
'bug-7271-condensed-nospace' => [
'expectedHtml' => '<ul class="listdecimal" style="list-style-type: decimal;"><li><a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
'text' => '[ol][*]http://example.com/[/ol]',
],
'bug-7271-indented-space' => [
'expectedHtml' => '<ul class="listbullet" style="list-style-type: circle;"><li> <a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
'text' => '[ul]
[*] http://example.com/
[/ul]',
],
'bug-7271-indented-nospace' => [
'expectedHtml' => '<ul class="listbullet" style="list-style-type: circle;"><li><a href="http://example.com/" target="_blank">http://example.com/</a></li></ul>',
'text' => '[ul]
[*]http://example.com/
[/ul]',
],
];
}
/**
* Test convert bbcodes to HTML
* @dataProvider dataBBCodes
*
* @param string $expectedHtml Expected HTML output
* @param string $text BBCode text
* @param int $simpleHtml BBCode::convert method $simple_html parameter value, optional.
* @param bool $forPlaintext BBCode::convert method $for_plaintext parameter value, optional.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function testConvert($expectedHtml, $text, $simpleHtml = 0, $forPlaintext = false)
{
$actual = BBCode::convert($text, false, $simpleHtml, $forPlaintext);
$this->assertEquals($expectedHtml, $actual);
}
}