X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58653f8b9d90c9f0a2f44d026b0ec84574f6bc9a..c8f26592a74e776b9827ed68ccc1ee345ff52408:/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 8bf06374f..edf1c7c4a 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -1,8 +1,12 @@ -require File.dirname(__FILE__) + '/../test_helper' +require "test_helper" -class UserRolesControllerTest < ActionController::IntegrationTest +class UserRolesTest < ActionDispatch::IntegrationTest fixtures :users, :user_roles + def setup + stub_hostip_requests + end + test "grant" do check_fail(:grant, :public_user, :moderator) check_fail(:grant, :moderator_user, :moderator) @@ -16,40 +20,38 @@ class UserRolesControllerTest < ActionController::IntegrationTest check_fail(:revoke, :administrator_user, :moderator) end + private + def check_fail(action, user, role) - get '/login' + get "/login" assert_response :redirect assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"} + post "/login", "username" => users(user).email, "password" => "test", :referer => "/" assert_response :redirect follow_redirect! assert_response :success - get "/user/#{users(:second_public_user).display_name}/role/#{role}/#{action}" - assert_response :redirect - assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name + 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! end def check_success(action, user, role) - get '/login' + get "/login" assert_response :redirect assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"} + post "/login", "username" => users(user).email, "password" => "test", :referer => "/" assert_response :redirect 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 - assert_redirected_to :controller => 'user', :action => 'view', :display_name => users(:second_public_user).display_name + 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! end