X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef820ade46f6df029bc4453769e20de7976525cb..b27e74eaac38bbd3a207e80bb16cb0581d871d26:/test/integration/user_roles_test.rb?ds=sidebyside diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index 17531ef3f..948bb895c 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -16,6 +16,8 @@ class UserRolesTest < ActionController::IntegrationTest check_fail(:revoke, :administrator_user, :moderator) end +private + def check_fail(action, user, role) get '/login' assert_response :redirect @@ -27,8 +29,7 @@ class UserRolesTest < ActionController::IntegrationTest follow_redirect! assert_response :success - get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" - assert_response :redirect + post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name reset! @@ -45,10 +46,7 @@ class UserRolesTest < ActionController::IntegrationTest follow_redirect! assert_response :success - get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" - assert_response :success - post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}", {:confirm => "yes", :nonce => session[:nonce]} - assert_response :redirect + post "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name reset!