')); } @@ -45,31 +53,28 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase * 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, '');
@@ -80,7 +85,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
/**
* Test reverse_nl2br().
*/
- function testReverseNl2br()
+ public function testReverseNl2br()
{
$text = 'stuff' . PHP_EOL . 'otherstuff';
$processedText = nl2br($text);
@@ -91,7 +96,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);
@@ -102,7 +107,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
/**
* Test sanitize_html().
*/
- function testSanitizeHtml()
+ public function testSanitizeHtml()
{
$input = '< script src="js.js"/>';
$input .= '< script attr>alert(\'xss\');';
@@ -110,6 +115,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 +126,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 +137,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 that a close value to nomarkdown is not understand as nomarkdown (previous value `.nomarkdown`).
+ */
+ 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']);
}
/**
- * Test hashtag links processed with markdown.
+ * Make sure that the generated HTML match the reference HTML file.
*/
- function testMarkdownHashtagLinks()
+ 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);
+ $data = process_markdown(
+ $md,
+ $this->conf->get('security.markdown_escape', true),
+ $this->conf->get('security.allowed_protocols')
+ );
$this->assertEquals($html, $data);
}
+
+ /**
+ * Make sure that the HTML tags are escaped.
+ */
+ public function testMarkdownWithHtmlEscape()
+ {
+ $md = '**strong** strong';
+ $html = ' strong <strong>strong</strong> strong strong