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

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

diff --git a/test/controllers/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb
index e9aadcc3a31a356ac21dc7781294060f6c44df3f..ba3d795def64bc4f1d4a1cd47f8f331ad844dda6 100644 (file)
--- a/test/controllers/user_roles_controller_test.rb
+++ b/test/controllers/user_roles_controller_test.rb
@@ -31,8 +31,7 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Granting should still fail
     post :grant, :params => { :display_name => target_user.display_name, :role => "moderator" }
-    assert_redirected_to user_path(target_user)
-    assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Login as an administrator
     session[:user] = administrator_user.id
@@ -92,8 +91,7 @@ class UserRolesControllerTest < ActionController::TestCase
 
     # Revoking should still fail
     post :revoke, :params => { :display_name => target_user.display_name, :role => "moderator" }
-    assert_redirected_to user_path(target_user)
-    assert_equal "Only administrators can perform user role management, and you are not an administrator.", flash[:error]
+    assert_redirected_to :controller => :errors, :action => :forbidden
 
     # Login as an administrator
     session[:user] = administrator_user.id