X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ba53dc7b04b4f081f748f2c506b25a3a6563f63d..927cc9f45e6626e2a82403d1263b4a16d601e30b:/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 ea0e7d488..9aafa3001 100644
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -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
@@ -395,8 +390,8 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
   end
 
   ##
-  # test the revoke all action
-  def test_revoke_all
+  # test the revoke all page
+  def test_revoke_all_page
     blocked_user = create(:user)
     create(:user_block, :user => blocked_user)
 
@@ -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
@@ -424,6 +418,53 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  ##
+  # test the revoke all action
+  def test_revoke_all_action
+    blocked_user = create(:user)
+    active_block1 = create(:user_block, :user => blocked_user)
+    active_block2 = create(:user_block, :user => blocked_user)
+    expired_block1 = create(:user_block, :expired, :user => blocked_user)
+    blocks = [active_block1, active_block2, expired_block1]
+    moderator_user = create(:moderator_user)
+
+    assert_predicate active_block1, :active?
+    assert_predicate active_block2, :active?
+    assert_not_predicate expired_block1, :active?
+
+    # Login as a normal user
+    session_for(create(:user))
+
+    # Check that normal users can't load the block revoke page
+    get revoke_all_user_blocks_path(:blocked_user)
+    assert_redirected_to :controller => "errors", :action => "forbidden"
+
+    # Login as a moderator
+    session_for(moderator_user)
+
+    # Check that revoking blocks using GET should fail
+    get revoke_all_user_blocks_path(blocked_user, :confirm => true)
+    assert_response :success
+    assert_template "revoke_all"
+
+    blocks.each(&:reload)
+    assert_predicate active_block1, :active?
+    assert_predicate active_block2, :active?
+    assert_not_predicate expired_block1, :active?
+
+    # Check that revoking blocks works using POST
+    post revoke_all_user_blocks_path(blocked_user, :confirm => true)
+    assert_redirected_to user_blocks_on_path(blocked_user)
+
+    blocks.each(&:reload)
+    assert_not_predicate active_block1, :active?
+    assert_not_predicate active_block2, :active?
+    assert_not_predicate expired_block1, :active?
+    assert_equal moderator_user, active_block1.revoker
+    assert_equal moderator_user, active_block2.revoker
+    assert_not_equal moderator_user, expired_block1.revoker
+  end
+
   ##
   # test the blocks_on action
   def test_blocks_on