8000 Get html_equal tests running with minitest · github/markup@5274499 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5274499

Browse files
author
Dawa Ometto
committed
Get html_equal tests running with minitest
1 parent c722768 commit 5274499

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ gem "RedCloth"
88
gem "rdoc", "~>3.6"
99
gem "org-ruby", "= 0.9.9"
1010
gem "creole", "~>0.3.6"
11-
gem "wikicloth", :platforms => :ruby
11+
gem "wikicloth", "=0.8.1", :platforms => :ruby
1212
gem "asciidoctor", "= 0.1.4"
13-
gem "rake"
13+
gem "rake"

‎github-markup.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
# See ext/mkrf_conf.rb for platform-specific dependencies
2121
s.add_development_dependency 'minitest', '~> 5.4.3'
2222
s.add_development_dependency 'html-pipeline', '~> 1.0'
23-
s.add_development_dependency 'sanitize', '~> 3.0'
23+
s.add_development_dependency 'sanitize', '~> 2.1.0'
2424
s.add_development_dependency 'nokogiri', '~> 1.6.1'
2525
s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
2626
end

‎test/markup_test.rb

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,21 @@ def normalize_html(text)
1717
end
1818

1919
def assert_html_equal(expected, actual, msg = nil)
20-
assert_block(msg) do
21-
expected_doc = Nokogiri::HTML(expected) {|config| config.noblanks}
22-
actual_doc = Nokogiri::HTML(actual) {|config| config.noblanks}
23-
24-
expected_doc.search('//text()').each {|node| node.content = normalize_html node.content}
25-
actual_doc.search('//text()').each {|node| node.content = normalize_html node.content}
26-
27-
ignore_changes = {"+" => Regexp.union(/^\s*id=".*"\s*$/), "-" => nil}
28-
expected_doc.diff(actual_doc) do |change, node|
29-
if change != ' ' && !node.blank? then
30-
break unless node.to_html =~ ignore_changes[change]
20+
assertion = Proc.new do
21+
expected_doc = Nokogiri::HTML(expected) {|config| config.noblanks}
22+
actual_doc = Nokogiri::HTML(actual) {|config| config.noblanks}
23+
24+
expected_doc.search('//text()').each {|node| node.content = normalize_html node.content}
25+
actual_doc.search('//text()').each {|node| node.content = normalize_html node.content}
26+
27+
ignore_changes = {"+" => Regexp.union(/^\s*id=".*"\s*$/), "-" => nil}
28+
expected_doc.diff(actual_doc) do |change, node|
29+
if change != ' ' && !node.blank? then
30+
break unless node.to_html =~ ignore_changes[change]
31+
end
3132
end
3233
end
33-
end
34+
assert(assertion.call, msg)
3435
end
3536

3637
class MarkupTest < Minitest::Test

0 commit comments

Comments
 (0)
0