aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-12-18 14:32:41 +0100
committerArthurHoaro <arthur@hoa.ro>2016-12-18 14:32:41 +0100
commitde92edd6dd6c09625d0acda8009ebbed86b98f47 (patch)
tree0e8db8f30404dace020e8e7616547d2ca4c88ed6 /tests
parent79a0dfe9cc658cbfafebac0aa9f1c2953faff777 (diff)
downloadShaarli-de92edd6dd6c09625d0acda8009ebbed86b98f47.tar.gz
Shaarli-de92edd6dd6c09625d0acda8009ebbed86b98f47.tar.zst
Shaarli-de92edd6dd6c09625d0acda8009ebbed86b98f47.zip
More merge mess up fixes
Diffstat (limited to 'tests')
-rw-r--r--tests/plugins/PluginMarkdownTest.php13
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php
index 4a67b2dc..17ef2280 100644
--- a/tests/plugins/PluginMarkdownTest.php
+++ b/tests/plugins/PluginMarkdownTest.php
@@ -185,17 +185,4 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase
185 $data = process_markdown($md); 185 $data = process_markdown($md);
186 $this->assertEquals($html, $data); 186 $this->assertEquals($html, $data);
187 } 187 }
188
189 /**
190 * Test hashtag links processed with markdown.
191 */
192 function testMarkdownHashtagLinks()
193 {
194 $md = file_get_contents('tests/plugins/resources/markdown.md');
195 $md = format_description($md);
196 $html = file_get_contents('tests/plugins/resources/markdown.html');
197
198 $data = process_markdown($md);
199 $this->assertEquals($html, $data);
200 }
201} 188}