X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tests%2Fplugins%2FPluginMarkdownTest.php;h=ddc2728d3ae22542f82dd9bd158de7a1bab73ec0;hb=50142efd1b4b826f60b1e5673dba5ccbe26e0108;hp=d359b2a164548f87ae282ec89c4b97ca84f8fbd7;hpb=7418f7cb60524c3bfc2f240386b5e3e7eb9b3257;p=github%2Fshaarli%2FShaarli.git diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php index d359b2a1..ddc2728d 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']); } /** @@ -36,7 +44,7 @@ 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'], '
')); } @@ -50,20 +58,17 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase $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'], '
'));
}
/**
@@ -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);
@@ -130,29 +137,26 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
))
);
- $processed = hook_markdown_render_linklist($data);
+ $processed = hook_markdown_render_linklist($data, $this->conf);
$this->assertEquals($str, $processed['links'][0]['description']);
- $processed = hook_markdown_render_feed($data);
+ $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']);
}
/**
@@ -169,20 +173,61 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
))
);
- $data = hook_markdown_render_feed($data);
+ $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.
*/
- public 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