Merge remote-tracking branch 'upstream/pull/4462'

[rails.git] / test / controllers / changesets_controller_test.rb

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index a71b5e8feb615773063a7c435c3a23350f524d48..d9a4b256bda2313e1cb0d011c051e99c41995983 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -321,7 +321,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   ##
   # check the result of a feed
   def check_feed_result(changesets)
-    assert changesets.size <= 20
+    assert_operator changesets.size, :<=, 20
 
     assert_select "feed", :count => [changesets.size, 1].min do
       assert_select "> title", :count => 1, :text => /^Changesets/
@@ -332,7 +332,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
         assert_select "> entry > content > xhtml|div > xhtml|table" do
           assert_select "> xhtml|tr > xhtml|td > xhtml|table" do
-            changeset.tags.each do |key, _|
+            changeset.tags.each_key do |key|
               assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = /
             end
           end