##// END OF EJS Templates
Merged r13105 (#16669)....
Jean-Philippe Lang -
r12883:d548d9338e78
parent child
Show More
@@ -127,7 +127,8 module Redmine
127 :space_after_headers => true,
127 :space_after_headers => true,
128 :tables => true,
128 :tables => true,
129 :strikethrough => true,
129 :strikethrough => true,
130 :superscript => true
130 :superscript => true,
131 :no_intra_emphasis => true
131 )
132 )
132 end
133 end
133 end
134 end
@@ -28,6 +28,10 class Redmine::WikiFormatting::MarkdownFormatterTest < ActionView::TestCase
28 assert_equal "<p><strong>foo</strong></p>", @formatter.new("**foo**").to_html.strip
28 assert_equal "<p><strong>foo</strong></p>", @formatter.new("**foo**").to_html.strip
29 end
29 end
30
30
31 def test_not_set_intra_emphasis
32 assert_equal "<p>foo_bar_baz</p>", @formatter.new("foo_bar_baz").to_html.strip
33 end
34
31 def test_wiki_links_should_be_preserved
35 def test_wiki_links_should_be_preserved
32 text = 'This is a wiki link: [[Foo]]'
36 text = 'This is a wiki link: [[Foo]]'
33 assert_include '[[Foo]]', @formatter.new(text).to_html
37 assert_include '[[Foo]]', @formatter.new(text).to_html
General Comments 0
You need to be logged in to leave comments. Login now