diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile index 129f554..c1891bf 100644 --- a/gemfiles/rails_4_2.gemfile +++ b/gemfiles/rails_4_2.gemfile @@ -9,5 +9,11 @@ gem "actionview", "~> 4.2.0" gem "actionpack", "~> 4.2.0" gem "activesupport", "~> 4.2.0" gem "rails-dom-testing" +platforms :ruby do + if RUBY_VERSION > "2.1.0" + else + gem 'nokogiri', '1.6.8.1' + end +end gemspec :path => "../" diff --git a/test/test_actionview-link_to_blank.rb b/test/test_actionview-link_to_blank.rb index 177e743..bd63097 100644 --- a/test/test_actionview-link_to_blank.rb +++ b/test/test_actionview-link_to_blank.rb @@ -384,15 +384,18 @@ def test_link_unless_current end private - # MiniTest does not have build_message method, so I copy from below: - # https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/assertions/dom.rb - # Test::Unit - # http://doc.ruby-lang.org/ja/1.9.3/method/Test=3a=3aUnit=3a=3aAssertions/i/build_message.html - # Test::Unit (based on MiniTest) - # http://www.ruby-doc.org/stdlib-2.0/libdoc/test/unit/rdoc/Test/Unit/Assertions.html#method-i-message - def assert_dom_equal(expected, actual, message = "") - expected_dom = HTML::Document.new(expected).root - actual_dom = HTML::Document.new(actual).root - assert_equal expected_dom, actual_dom + + if Gem::Version.new(ActionPack::VERSION::STRING) < Gem::Version.new("4") + # MiniTest does not have build_message method, so I copy from below: + # https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/assertions/dom.rb + # Test::Unit + # http://doc.ruby-lang.org/ja/1.9.3/method/Test=3a=3aUnit=3a=3aAssertions/i/build_message.html + # Test::Unit (based on MiniTest) + # http://www.ruby-doc.org/stdlib-2.0/libdoc/test/unit/rdoc/Test/Unit/Assertions.html#method-i-message + def assert_dom_equal(expected, actual, message = "") + expected_dom = HTML::Document.new(expected).root + actual_dom = HTML::Document.new(actual).root + assert_equal expected_dom, actual_dom + end end end