X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2Fplugins%2FPluginMarkdownTest.php;h=44364b05b5f4a14036e432a51fdc539668ac39dd;hb=00af48d9d20af1ce51c8ad42fe354fafc9ceb8a3;hp=12bdda24231b47a9cad0454694d030d7b4884362;hpb=761b4e283737a48934457855448df98e8014ba73;p=github%2Fshaarli%2FShaarli.git diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php index 12bdda24..44364b05 100644 --- a/tests/plugins/PluginMarkdownTest.php +++ b/tests/plugins/PluginMarkdownTest.php @@ -1,4 +1,5 @@ conf = new ConfigManager('tests/utils/config/configJson'); + $this->conf->set('security.allowed_protocols', ['ftp', 'magnet']); } /** * Test render_linklist hook. * Only check that there is basic markdown rendering. */ - function testMarkdownLinklist() + public function testMarkdownLinklist() { $markdown = '# My title' . PHP_EOL . 'Very interesting content.'; $data = array( @@ -36,40 +44,63 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase ), ); - $data = hook_markdown_render_linklist($data); + $data = hook_markdown_render_linklist($data, $this->conf); $this->assertNotFalse(strpos($data['links'][0]['description'], '
')); + + $this->assertEquals($markdown, $data['links'][0]['description_src']); + } + + /** + * Test render_feed hook. + */ + public function testMarkdownFeed() + { + $markdown = '# My title' . PHP_EOL . 'Very interesting content.'; + $markdown .= '— Permalien'; + $data = array( + 'links' => array( + 0 => array( + 'description' => $markdown, + ), + ), + ); + + $data = hook_markdown_render_feed($data, $this->conf); + $this->assertNotFalse(strpos($data['links'][0]['description'], '
')); + $this->assertStringEndsWith( + '— Permalien
', + $data['links'][0]['description'] + ); } /** * Test render_daily hook. * Only check that there is basic markdown rendering. */ - function testMarkdownDaily() + public function testMarkdownDaily() { $markdown = '# My title' . PHP_EOL . 'Very interesting content.'; $data = array( // Columns data - 'cols' => array( - // First, second, third. + 'linksToDisplay' => array( + // nth link 0 => array( - // nth link - 0 => array( - 'formatedDescription' => $markdown, - ), + 'formatedDescription' => $markdown, ), ), ); - $data = hook_markdown_render_daily($data); - $this->assertNotFalse(strpos($data['cols'][0][0]['formatedDescription'], '')); + $data = hook_markdown_render_daily($data, $this->conf); + $this->assertNotFalse(strpos($data['linksToDisplay'][0]['formatedDescription'], '
'));
}
/**
* Test reverse_text2clickable().
*/
- function testReverseText2clickable()
+ public function testReverseText2clickable()
{
$text = 'stuff http://hello.there/is=someone#here otherstuff';
$clickableText = text2clickable($text, '');
@@ -77,10 +108,22 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
$this->assertEquals($text, $reversedText);
}
+ /**
+ * Test reverse_text2clickable().
+ */
+ public function testReverseText2clickableHashtags()
+ {
+ $text = file_get_contents('tests/plugins/resources/hashtags.raw');
+ $md = file_get_contents('tests/plugins/resources/hashtags.md');
+ $clickableText = hashtag_autolink($text);
+ $reversedText = reverse_text2clickable($clickableText);
+ $this->assertEquals($md, $reversedText);
+ }
+
/**
* Test reverse_nl2br().
*/
- function testReverseNl2br()
+ public function testReverseNl2br()
{
$text = 'stuff' . PHP_EOL . 'otherstuff';
$processedText = nl2br($text);
@@ -91,7 +134,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
/**
* Test reverse_space2nbsp().
*/
- function testReverseSpace2nbsp()
+ public function testReverseSpace2nbsp()
{
$text = ' stuff' . PHP_EOL . ' otherstuff and another';
$processedText = space2nbsp($text);
@@ -99,10 +142,41 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
$this->assertEquals($text, $reversedText);
}
+ public function testReverseFeedPermalink()
+ {
+ $text = 'Description... ';
+ $text .= '— Permalien';
+ $expected = 'Description... — [Permalien](http://domain.tld/?0oc_VQ)';
+ $processedText = reverse_feed_permalink($text);
+
+ $this->assertEquals($expected, $processedText);
+ }
+
+ public function testReverseLastFeedPermalink()
+ {
+ $text = 'Description... ';
+ $text .= ' strong <strong>strong</strong> strong strong
— Permalien';
+ $expected = $text;
+ $text .= '
— Permalien';
+ $expected .= '
— [Permalien](http://domain.tld/?0oc_VQ)';
+ $processedText = reverse_feed_permalink($text);
+
+ $this->assertEquals($expected, $processedText);
+ }
+
+ public function testReverseNoFeedPermalink()
+ {
+ $text = 'Hello! Where are you from?';
+ $expected = $text;
+ $processedText = reverse_feed_permalink($text);
+
+ $this->assertEquals($expected, $processedText);
+ }
+
/**
* Test sanitize_html().
*/
- function testSanitizeHtml()
+ public function testSanitizeHtml()
{
$input = '< script src="js.js"/>';
$input .= '< script attr>alert(\'xss\');';
@@ -110,6 +184,8 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
$output = escape($input);
$input .= 'link';
$output .= 'link';
+ $input .= 'link';
+ $output .= 'link';
$this->assertEquals($output, sanitize_html($input));
// Do not touch escaped HTML.
$input = escape($input);
@@ -119,7 +195,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
/**
* Test the no markdown tag.
*/
- function testNoMarkdownTag()
+ public function testNoMarkdownTag()
{
$str = 'All _work_ and `no play` makes Jack a *dull* boy.';
$data = array(
@@ -130,38 +206,97 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
))
);
- $data = hook_markdown_render_linklist($data);
- $this->assertEquals($str, $data['links'][0]['description']);
+ $processed = hook_markdown_render_linklist($data, $this->conf);
+ $this->assertEquals($str, $processed['links'][0]['description']);
+
+ $processed = hook_markdown_render_feed($data, $this->conf);
+ $this->assertEquals($str, $processed['links'][0]['description']);
$data = array(
// Columns data
- 'cols' => array(
- // First, second, third.
+ 'linksToDisplay' => array(
+ // nth link
0 => array(
- // nth link
- 0 => array(
- 'formatedDescription' => $str,
- 'tags' => NO_MD_TAG,
- 'taglist' => array(),
- ),
+ 'formatedDescription' => $str,
+ 'tags' => NO_MD_TAG,
+ 'taglist' => array(),
),
),
);
- $data = hook_markdown_render_daily($data);
- $this->assertEquals($str, $data['cols'][0][0]['formatedDescription']);
+ $data = hook_markdown_render_daily($data, $this->conf);
+ $this->assertEquals($str, $data['linksToDisplay'][0]['formatedDescription']);
}
/**
- * Test hashtag links processed with markdown.
+ * Test that a close value to nomarkdown is not understand as nomarkdown (previous value `.nomarkdown`).
*/
- function testMarkdownHashtagLinks()
+ public function testNoMarkdownNotExcactlyMatching()
+ {
+ $str = 'All _work_ and `no play` makes Jack a *dull* boy.';
+ $data = array(
+ 'links' => array(array(
+ 'description' => $str,
+ 'tags' => '.' . NO_MD_TAG,
+ 'taglist' => array('.'. NO_MD_TAG),
+ ))
+ );
+
+ $data = hook_markdown_render_feed($data, $this->conf);
+ $this->assertContains('', $data['links'][0]['description']);
+ }
+
+ /**
+ * Make sure that the generated HTML match the reference HTML file.
+ */
+ public function testMarkdownGlobalProcessDescription()
{
$md = file_get_contents('tests/plugins/resources/markdown.md');
$md = format_description($md);
$html = file_get_contents('tests/plugins/resources/markdown.html');
- $data = process_markdown($md);
- $this->assertEquals($html, $data);
+ $data = process_markdown(
+ $md,
+ $this->conf->get('security.markdown_escape', true),
+ $this->conf->get('security.allowed_protocols')
+ );
+ $this->assertEquals($html, $data . PHP_EOL);
+ }
+
+ /**
+ * Make sure that the HTML tags are escaped.
+ */
+ public function testMarkdownWithHtmlEscape()
+ {
+ $md = '**strong** strong';
+ $html = '