Add earliest allowed deletion time to user model

[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 fbbb36f3fc664dc2c813781acd0ef77d13c1729d..79fd7a571e5f7b919d85b796d5baa879588c2663 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -164,7 +164,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     get friend_changesets_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
+    assert_redirected_to login_path(:referer => friend_changesets_path)
 
     session_for(private_user)
 
@@ -190,7 +190,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     get nearby_changesets_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
+    assert_redirected_to login_path(:referer => nearby_changesets_path)
 
     session_for(private_user)
 
@@ -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/
@@ -329,6 +329,14 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
       changesets.each do |changeset|
         assert_select "> entry > id", changeset_url(:id => changeset.id)
+
+        assert_select "> entry > content > xhtml|div > xhtml|table" do
+          assert_select "> xhtml|tr > xhtml|td > xhtml|table" do
+            changeset.tags.each do |key, _|
+              assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = /
+            end
+          end
+        end
       end
     end
   end