X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f2d13c075660efb9582d7fb600bd6798d7a382ca..5f495b43d18bfa7a9bcaf918aa4db15261bea46a:/test/integration/user_roles_test.rb diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index 08031b4de..573243025 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class UserRolesTest < ActionDispatch::IntegrationTest fixtures :users, :user_roles @@ -16,38 +16,38 @@ class UserRolesTest < ActionDispatch::IntegrationTest check_fail(:revoke, :administrator_user, :moderator) end -private + 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 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 + 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 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 + assert_redirected_to :controller => "user", :action => "view", :display_name => users(:second_public_user).display_name reset! end