X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fc9df968fc1403a2130e5774552c430b2c0acf59..a65efc192739f710c29312e92a0bd8fbc0fa81d8:/test/integration/user_roles_test.rb diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index 0691edc8e..948bb895c 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../test_helper' -class UserRolesControllerTest < ActionController::IntegrationTest +class UserRolesTest < ActionController::IntegrationTest fixtures :users, :user_roles test "grant" do @@ -16,19 +16,20 @@ class UserRolesControllerTest < ActionController::IntegrationTest check_fail(:revoke, :administrator_user, :moderator) end +private + def check_fail(action, user, role) get '/login' assert_response :redirect assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - post '/login', {'user[email]' => users(user).email, 'user[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 + 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! @@ -40,15 +41,12 @@ class UserRolesControllerTest < ActionController::IntegrationTest assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - post '/login', {'user[email]' => users(user).email, 'user[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 + 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!