Update bundle

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

diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
index 0877fa39e400f0b809178e96fe7cdfd832986465..b74e3de460283c4ce1bb662f890ca29a34d138b5 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -88,14 +88,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     get user_blocks_path
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
 
     get user_blocks_path(:page => 2)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
   end
 
@@ -148,7 +148,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't load the block creation page
     get new_user_block_path(:display_name => target_user.display_name)
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as a moderator
@@ -186,7 +185,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't load the block edit page
     get edit_user_block_path(:id => active_block)
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as a moderator
@@ -224,7 +222,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't create blocks
     post user_blocks_path
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as a moderator
@@ -300,7 +297,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't update blocks
     put user_block_path(:id => active_block)
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as the wrong moderator
@@ -359,7 +355,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't load the block revoke page
     get revoke_user_block_path(:id => active_block)
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as a moderator
@@ -413,7 +408,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't load the revoke all blocks page
     get revoke_all_user_blocks_path(blocked_user)
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as a moderator
@@ -443,7 +437,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     # Check that normal users can't load the block revoke page
     get revoke_all_user_blocks_path(:blocked_user)
-    assert_response :redirect
     assert_redirected_to :controller => "errors", :action => "forbidden"
 
     # Login as a moderator
@@ -520,14 +513,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     get user_blocks_on_path(:display_name => user.display_name)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
 
     get user_blocks_on_path(:display_name => user.display_name, :page => 2)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
   end
 
@@ -579,14 +572,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
     get user_blocks_by_path(:display_name => user.display_name)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
 
     get user_blocks_by_path(:display_name => user.display_name, :page => 2)
     assert_response :success
-    assert_select "table#block_list", :count => 1 do
-      assert_select "tr", :count => 21
+    assert_select "table#block_list tbody", :count => 1 do
+      assert_select "tr", :count => 20
     end
   end
 end