| a | c | ].each { |html| assert_includes out, html }
end
end
diff --git a/test/test_commonmark.rb b/test/test_commonmark.rb
index 66bae9af..75980e03 100644
--- a/test/test_commonmark.rb
+++ b/test/test_commonmark.rb
@@ -30,7 +30,7 @@ def test_to_commonmark
compare = render_doc(@markdown).to_commonmark
assert_equal \
- render_doc(@markdown).to_html.gsub(/ +/, ' ').gsub(HTML_COMMENT, ''),
- render_doc(compare).to_html.gsub(/ +/, ' ').gsub(HTML_COMMENT, '')
+ render_doc(@markdown).to_html.squeeze(' ').gsub(HTML_COMMENT, ''),
+ render_doc(compare).to_html.squeeze(' ').gsub(HTML_COMMENT, '')
end
end
diff --git a/test/test_doc.rb b/test/test_doc.rb
index 0796ed2f..c2a8649a 100644
--- a/test/test_doc.rb
+++ b/test/test_doc.rb
@@ -17,114 +17,114 @@ def setup
end
def test_get_type
- assert_equal @doc.type, :document
+ assert_equal(:document, @doc.type)
end
def test_get_type_string
- assert_equal @doc.type_string, 'document'
+ assert_equal('document', @doc.type_string)
end
def test_get_first_child
- assert_equal @first_child.type, :paragraph
+ assert_equal(:paragraph, @first_child.type)
end
def test_get_next
- assert_equal @first_child.first_child.next.type, :emph
+ assert_equal(:emph, @first_child.first_child.next.type)
end
def test_insert_before
paragraph = Node.new(:paragraph)
- assert_equal @first_child.insert_before(paragraph), true
+ assert(@first_child.insert_before(paragraph))
assert_match "\nHi there.", @doc.to_html
end
def test_insert_after
paragraph = Node.new(:paragraph)
- assert_equal @first_child.insert_after(paragraph), true
+ assert(@first_child.insert_after(paragraph))
assert_match "many nodes!
\n\n", @doc.to_html
end
def test_prepend_child
code = Node.new(:code)
- assert_equal @first_child.prepend_child(code), true
+ assert(@first_child.prepend_child(code))
assert_match '
\n", @doc.to_html
end
def test_get_last_child
- assert_equal @last_child.type, :paragraph
+ assert_equal(:paragraph, @last_child.type)
end
def test_get_parent
- assert_equal @first_child.first_child.next.parent.type, :paragraph
+ assert_equal(:paragraph, @first_child.first_child.next.parent.type)
end
def test_get_previous
- assert_equal @first_child.first_child.next.previous.type, :text
+ assert_equal(:text, @first_child.first_child.next.previous.type)
end
def test_get_url
- assert_equal @link.url, 'https://www.github.com'
+ assert_equal('https://www.github.com', @link.url)
end
def test_set_url
- assert_equal @link.url = 'https://www.mozilla.org', 'https://www.mozilla.org'
+ assert_equal('https://www.mozilla.org', @link.url = 'https://www.mozilla.org')
end
def test_get_title
- assert_equal @image.title, 'Favicon'
+ assert_equal('Favicon', @image.title)
end
def test_set_title
- assert_equal @image.title = 'Octocat', 'Octocat'
+ assert_equal('Octocat', @image.title = 'Octocat')
end
def test_get_header_level
- assert_equal @header.header_level, 3
+ assert_equal(3, @header.header_level)
end
def test_set_header_level
- assert_equal @header.header_level = 6, 6
+ assert_equal(6, @header.header_level = 6)
end
def test_get_list_type
- assert_equal @ul_list.list_type, :bullet_list
- assert_equal @ol_list.list_type, :ordered_list
+ assert_equal(:bullet_list, @ul_list.list_type)
+ assert_equal(:ordered_list, @ol_list.list_type)
end
def test_set_list_type
- assert_equal @ul_list.list_type = :ordered_list, :ordered_list
- assert_equal @ol_list.list_type = :bullet_list, :bullet_list
+ assert_equal(:ordered_list, @ul_list.list_type = :ordered_list)
+ assert_equal(:bullet_list, @ol_list.list_type = :bullet_list)
end
def test_get_list_start
- assert_equal @ol_list.list_start, 1
+ assert_equal(1, @ol_list.list_start)
end
def test_set_list_start
- assert_equal @ol_list.list_start = 8, 8
+ assert_equal(8, @ol_list.list_start = 8)
end
def test_get_list_tight
- assert_equal @ul_list.list_tight, true
- assert_equal @ol_list.list_tight, true
+ assert(@ul_list.list_tight)
+ assert(@ol_list.list_tight)
end
def test_set_list_tight
- assert_equal @ul_list.list_tight = false, false
- assert_equal @ol_list.list_tight = false, false
+ refute(@ul_list.list_tight = false)
+ refute(@ol_list.list_tight = false)
end
def test_get_fence_info
- assert_equal @fence.fence_info, 'ruby'
+ assert_equal('ruby', @fence.fence_info)
end
def test_set_fence_info
- assert_equal @fence.fence_info = 'javascript', 'javascript'
+ assert_equal('javascript', @fence.fence_info = 'javascript')
end
end
diff --git a/test/test_encoding.rb b/test/test_encoding.rb
index f977515d..8a96cf9f 100644
--- a/test/test_encoding.rb
+++ b/test/test_encoding.rb
@@ -8,13 +8,13 @@ def test_encoding
contents = fixtures_file('curly.md')
doc = CommonMarker.render_doc(contents, :SMART)
render = doc.to_html
- assert_equal render.rstrip, 'This curly quote “makes commonmarker throw an exception”.
'
+ assert_equal('This curly quote “makes commonmarker throw an exception”.
', render.rstrip)
end
def test_string_content_is_utf8
doc = CommonMarker.render_doc('Hi *there*')
text = doc.first_child.last_child.first_child
- assert_equal text.string_content, 'there'
- assert_equal text.string_content.encoding.name, 'UTF-8'
+ assert_equal('there', text.string_content)
+ assert_equal('UTF-8', text.string_content.encoding.name)
end
end
diff --git a/test/test_extensions.rb b/test/test_extensions.rb
index d1d456d9..b904becc 100644
--- a/test/test_extensions.rb
+++ b/test/test_extensions.rb
@@ -9,30 +9,30 @@ def setup
def test_uses_specified_extensions
CommonMarker.render_html(@markdown, :DEFAULT, %i[]).tap do |out|
- assert out.include?('| a')
- assert out.include?('| x')
- assert out.include?('~~hi~~')
+ assert_includes out, '| a'
+ assert_includes out, '| x'
+ assert_includes out, '~~hi~~'
end
CommonMarker.render_html(@markdown, :DEFAULT, %i[table]).tap do |out|
- refute out.include?('| a')
- %w[ | a | c | x].each { |html| assert out.include?(html) }
- assert out.include?('~~hi~~')
+ refute_includes out, '| a'
+ %w[ | a | c | x].each { |html| assert_includes out, html }
+ assert_includes out, '~~hi~~'
end
CommonMarker.render_html(@markdown, :DEFAULT, %i[strikethrough]).tap do |out|
- assert out.include?('| a')
- refute out.include?('~~hi~~')
- assert out.include?('hi')
+ assert_includes out, '| a'
+ refute_includes out, '~~hi~~'
+ assert_includes out, 'hi'
end
doc = CommonMarker.render_doc('~a~ ~~b~~ ~~~c~~~', :STRIKETHROUGH_DOUBLE_TILDE, [:strikethrough])
- assert_equal doc.to_html, "~a~ b ~~~c~~~
\n"
+ assert_equal("~a~ b ~~~c~~~
\n", doc.to_html)
CommonMarker.render_html(@markdown, :DEFAULT, %i[table strikethrough]).tap do |out|
- refute out.include?('| a')
- refute out.include?('| x')
- refute out.include?('~~hi~~')
+ refute_includes out, '| a'
+ refute_includes out, '| x'
+ refute_includes out, '~~hi~~'
end
end
@@ -40,19 +40,19 @@ def test_extensions_with_renderers
doc = CommonMarker.render_doc(@markdown, :DEFAULT, %i[table])
doc.to_html.tap do |out|
- refute out.include?('| a')
- %w[ | a | c | x].each { |html| assert out.include?(html) }
- assert out.include?('~~hi~~')
+ refute_includes out, '| a'
+ %w[ | a | c | x].each { |html| assert_includes out, html }
+ assert_includes out, '~~hi~~'
end
HtmlRenderer.new.render(doc).tap do |out|
- refute out.include?('| a')
- %w[ | a | c | x].each { |html| assert out.include?(html) }
- assert out.include?('~~hi~~')
+ refute_includes out, '| a'
+ %w[ | a | c | x].each { |html| assert_includes out, html }
+ assert_includes out, '~~hi~~'
end
doc = CommonMarker.render_doc('~a~ ~~b~~ ~~~c~~~', :STRIKETHROUGH_DOUBLE_TILDE, [:strikethrough])
- assert_equal HtmlRenderer.new.render(doc), "~a~ b ~~~c~~~
\n"
+ assert_equal("~a~ b ~~~c~~~
\n", HtmlRenderer.new.render(doc))
end
def test_bad_extension_specifications
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 44cebda9..5963982c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -44,8 +44,8 @@ def open_spec_file(filename)
example_number += 1
end_line = line_number
tests << {
- markdown: markdown_lines.join('').tr('→', "\t"),
- html: html_lines.join('').tr('→', "\t").rstrip,
+ markdown: markdown_lines.join.tr('→', "\t"),
+ html: html_lines.join.tr('→', "\t").rstrip,
example: example_number,
start_line: start_line,
end_line: end_line,
diff --git a/test/test_maliciousness.rb b/test/test_maliciousness.rb
index f7b5b1dd..e017796c 100644
--- a/test/test_maliciousness.rb
+++ b/test/test_maliciousness.rb
@@ -70,7 +70,7 @@ def test_rendering_with_bad_type
err = assert_raises TypeError do
CommonMarker.render_html("foo \n baz", [:SMART])
end
- assert_equal err.message, 'option \':SMART\' does not exist for CommonMarker::Config::Render'
+ assert_equal('option \':SMART\' does not exist for CommonMarker::Config::Render', err.message)
assert_raises TypeError do
CommonMarker.render_doc("foo \n baz", 123)
@@ -79,7 +79,7 @@ def test_rendering_with_bad_type
err = assert_raises TypeError do
CommonMarker.render_doc("foo \n baz", :safe)
end
- assert_equal err.message, 'option \':safe\' does not exist for CommonMarker::Config::Parse'
+ assert_equal('option \':safe\' does not exist for CommonMarker::Config::Parse', err.message)
assert_raises TypeError do
CommonMarker.render_doc("foo \n baz", :totes_fake)
diff --git a/test/test_pathological_inputs.rb b/test/test_pathological_inputs.rb
index c0b08800..b94e4575 100644
--- a/test/test_pathological_inputs.rb
+++ b/test/test_pathological_inputs.rb
@@ -10,7 +10,7 @@ def markdown(str)
# list of pairs consisting of input and a regex that must match the output.
pathological = {
'nested strong emph' =>
- [('*a **a ' * 65_000) + 'b' + (' a** a*' * 65_000),
+ ["#{'*a **a ' * 65_000}b#{' a** a*' * 65_000}",
Regexp.compile('(a a ){65_000}b( a a){65_000}')],
'many emph closers with no openers' =>
[('a_ ' * 65_000),
@@ -34,10 +34,10 @@ def markdown(str)
['**x [a*b**c*](d)',
Regexp.compile('\\*\\*x abc')],
'nested brackets' =>
- [('[' * 50_000) + 'a' + (']' * 50_000),
+ ["#{'[' * 50_000}a#{']' * 50_000}",
Regexp.compile('\[{50000}a\]{50000}')],
'nested block quotes' =>
- [(('> ' * 50_000) + 'a'),
+ ["#{'> ' * 50_000}a",
Regexp.compile('(\n){50000}')],
'U+0000 in input' =>
['abc\u0000de\u0000',
@@ -53,41 +53,41 @@ def markdown(str)
if ENV['BENCH']
class PathologicalInputsPerformanceTest < Minitest::Benchmark
- def bench_pathological_1
+ def test_bench_pathological_one
assert_performance_linear 0.99 do |n|
star = '*' * (n * 10)
markdown("#{star}#{star}hi#{star}#{star}")
end
end
- def bench_pathological_2
+ def test_bench_pathological_two
assert_performance_linear 0.99 do |n|
c = '`t`t`t`t`t`t' * (n * 10)
markdown(c)
end
end
- def bench_pathological_3
+ def test_bench_pathological_three
assert_performance_linear 0.99 do |n|
markdown(" [a]: #{'A' * n}\n\n#{'[a][]' * n}\n")
end
end
- def bench_pathological_4
+ def test_bench_pathological_four
assert_performance_linear 0.5 do |n|
markdown("#{'[' * n}a#{']' * n}")
end
end
- def bench_pathological_5
+ def test_bench_pathological_five
assert_performance_linear 0.99 do |n|
markdown("#{'**a *a ' * n}#{'a* a**' * n}")
end
end
- def bench_unbound_recursion
+ def test_bench_unbound_recursion
assert_performance_linear 0.99 do |n|
- markdown(('[' * n) + 'foo' + ('](bar)' * n))
+ markdown("#{'[' * n}foo#{'](bar)' * n}")
end
end
end