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

[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 e5b0bdb3208468a769eaa0f21a5fe213fdbfaf19..326f2335afc69ecc8f320fb08ee114ff5ac12179 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -145,8 +145,8 @@ class UserBlocksControllerTest < ActionController::TestCase
 
     # Check that normal users can't load the block creation page
     get :new, :params => { :display_name => target_user.display_name }
 
     # Check that normal users can't load the block creation page
     get :new, :params => { :display_name => target_user.display_name }

-    assert_redirected_to user_blocks_path
-    assert_equal "You need to be a moderator to perform that action.", flash[:error]
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
     session[:user] = create(:moderator_user).id
 
     # Login as a moderator
     session[:user] = create(:moderator_user).id


@@ -165,13 +165,13 @@ class UserBlocksControllerTest < ActionController::TestCase
     # We should get an error if no user is specified
     get :new
     assert_response :not_found
     # We should get an error if no user is specified
     get :new
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user  does not exist"
 
     # We should get an error if the user doesn't exist
     get :new, :params => { :display_name => "non_existent_user" }
     assert_response :not_found
     assert_select "h1", "The user  does not exist"
 
     # We should get an error if the user doesn't exist
     get :new, :params => { :display_name => "non_existent_user" }
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
   end
 
     assert_select "h1", "The user non_existent_user does not exist"
   end
 


@@ -182,15 +182,15 @@ class UserBlocksControllerTest < ActionController::TestCase
 
     # Check that the block edit page requires us to login
     get :edit, :params => { :id => active_block.id }
 
     # Check that the block edit page requires us to login
     get :edit, :params => { :id => active_block.id }

-    assert_redirected_to login_path(:referer => edit_user_block_path(:id => active_block.id))
+    assert_redirected_to login_path(:referer => edit_user_block_path(active_block))

 
     # Login as a normal user
     session[:user] = create(:user).id
 
     # Check that normal users can't load the block edit page
     get :edit, :params => { :id => active_block.id }
 
     # Login as a normal user
     session[:user] = create(:user).id
 
     # Check that normal users can't load the block edit page
     get :edit, :params => { :id => active_block.id }

-    assert_redirected_to user_blocks_path
-    assert_equal "You need to be a moderator to perform that action.", flash[:error]
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
     session[:user] = create(:moderator_user).id
 
     # Login as a moderator
     session[:user] = create(:moderator_user).id


@@ -232,7 +232,8 @@ class UserBlocksControllerTest < ActionController::TestCase
 
     # Check that normal users can't create blocks
     post :create
 
     # Check that normal users can't create blocks
     post :create

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
     session[:user] = moderator_user.id
 
     # Login as a moderator
     session[:user] = moderator_user.id


@@ -268,13 +269,13 @@ class UserBlocksControllerTest < ActionController::TestCase
     # We should get an error if no user is specified
     post :create
     assert_response :not_found
     # We should get an error if no user is specified
     post :create
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user  does not exist"
 
     # We should get an error if the user doesn't exist
     post :create, :params => { :display_name => "non_existent_user" }
     assert_response :not_found
     assert_select "h1", "The user  does not exist"
 
     # We should get an error if the user doesn't exist
     post :create, :params => { :display_name => "non_existent_user" }
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
   end
 
     assert_select "h1", "The user non_existent_user does not exist"
   end
 


@@ -294,7 +295,8 @@ class UserBlocksControllerTest < ActionController::TestCase
 
     # Check that normal users can't update blocks
     put :update, :params => { :id => active_block.id }
 
     # Check that normal users can't update blocks
     put :update, :params => { :id => active_block.id }

-    assert_response :forbidden
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as the wrong moderator
     session[:user] = second_moderator_user.id
 
     # Login as the wrong moderator
     session[:user] = second_moderator_user.id


@@ -306,7 +308,7 @@ class UserBlocksControllerTest < ActionController::TestCase
                        :user_block_period => "12",
                        :user_block => { :needs_view => true, :reason => "Vandalism" } }
     end
                        :user_block_period => "12",
                        :user_block => { :needs_view => true, :reason => "Vandalism" } }
     end

-    assert_redirected_to edit_user_block_path(:id => active_block.id)
+    assert_redirected_to edit_user_block_path(active_block)

     assert_equal "Only the moderator who created this block can edit it.", flash[:error]
 
     # Login as the correct moderator
     assert_equal "Only the moderator who created this block can edit it.", flash[:error]
 
     # Login as the correct moderator


@@ -318,7 +320,7 @@ class UserBlocksControllerTest < ActionController::TestCase
           :params => { :id => active_block.id,
                        :user_block_period => "99" }
     end
           :params => { :id => active_block.id,
                        :user_block_period => "99" }
     end

-    assert_redirected_to edit_user_block_path(:id => active_block.id)
+    assert_redirected_to edit_user_block_path(active_block)

     assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
 
     # Check that updating a block works
     assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error]
 
     # Check that updating a block works


@@ -328,7 +330,7 @@ class UserBlocksControllerTest < ActionController::TestCase
                        :user_block_period => "12",
                        :user_block => { :needs_view => true, :reason => "Vandalism" } }
     end
                        :user_block_period => "12",
                        :user_block => { :needs_view => true, :reason => "Vandalism" } }
     end

-    assert_redirected_to user_block_path(:id => active_block.id)
+    assert_redirected_to user_block_path(active_block)

     assert_equal "Block updated.", flash[:notice]
     b = UserBlock.find(active_block.id)
     assert_in_delta Time.now, b.updated_at, 1
     assert_equal "Block updated.", flash[:notice]
     b = UserBlock.find(active_block.id)
     assert_in_delta Time.now, b.updated_at, 1


@@ -361,8 +363,8 @@ class UserBlocksControllerTest < ActionController::TestCase
 
     # Check that normal users can't load the block revoke page
     get :revoke, :params => { :id => active_block.id }
 
     # Check that normal users can't load the block revoke page
     get :revoke, :params => { :id => active_block.id }

-    assert_redirected_to user_blocks_path
-    assert_equal "You need to be a moderator to perform that action.", flash[:error]
+    assert_response :redirect
+    assert_redirected_to :controller => "errors", :action => "forbidden"

 
     # Login as a moderator
     session[:user] = create(:moderator_user).id
 
     # Login as a moderator
     session[:user] = create(:moderator_user).id


@@ -378,7 +380,7 @@ class UserBlocksControllerTest < ActionController::TestCase
 
     # Check that revoking a block works
     post :revoke, :params => { :id => active_block.id, :confirm => true }
 
     # Check that revoking a block works
     post :revoke, :params => { :id => active_block.id, :confirm => true }

-    assert_redirected_to user_block_path(:id => active_block.id)
+    assert_redirected_to user_block_path(active_block)

     b = UserBlock.find(active_block.id)
     assert_in_delta Time.now, b.ends_at, 1
 
     b = UserBlock.find(active_block.id)
     assert_in_delta Time.now, b.ends_at, 1
 


@@ -412,7 +414,7 @@ class UserBlocksControllerTest < ActionController::TestCase
     # Asking for a list of blocks with a bogus user name should fail
     get :blocks_on, :params => { :display_name => "non_existent_user" }
     assert_response :not_found
     # Asking for a list of blocks with a bogus user name should fail
     get :blocks_on, :params => { :display_name => "non_existent_user" }
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks for a user that has never been blocked
     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks for a user that has never been blocked


@@ -476,7 +478,7 @@ class UserBlocksControllerTest < ActionController::TestCase
     # Asking for a list of blocks with a bogus user name should fail
     get :blocks_by, :params => { :display_name => "non_existent_user" }
     assert_response :not_found
     # Asking for a list of blocks with a bogus user name should fail
     get :blocks_by, :params => { :display_name => "non_existent_user" }
     assert_response :not_found

-    assert_template "user/no_such_user"
+    assert_template "users/no_such_user"

     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks given by one moderator
     assert_select "h1", "The user non_existent_user does not exist"
 
     # Check the list of blocks given by one moderator