From: Andy Allan Date: Wed, 28 Nov 2018 16:21:12 +0000 (+0100) Subject: Remove user_roles integration test since it is not meaningful X-Git-Tag: live~3361^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ed8e15c8f0f663a199f68b5f3b71c36529b2b51e?hp=aaf56003427cfcbd89fda0847726fd0baa34050c Remove user_roles integration test since it is not meaningful This test has not been meaningful for a long while, since both check_success and check_fail contain exactly the same code. Additionally, the test doesn't cover any integrations (beyond logging in), and so it is only covering the same ground as the controller test. --- diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb deleted file mode 100644 index 9d367150d..000000000 --- a/test/integration/user_roles_test.rb +++ /dev/null @@ -1,58 +0,0 @@ -require "test_helper" - -class UserRolesTest < ActionDispatch::IntegrationTest - def setup - stub_hostip_requests - end - - test "grant" do - check_fail(:grant, :user, :moderator) - check_fail(:grant, :moderator_user, :moderator) - check_success(:grant, :administrator_user, :moderator) - end - - test "revoke" do - check_fail(:revoke, :user, :moderator) - check_fail(:revoke, :moderator_user, :moderator) - # this other user doesn't have moderator role, so this fails - check_fail(:revoke, :administrator_user, :moderator) - end - - private - - def check_fail(action, user, role) - get "/login" - assert_response :redirect - assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true" - follow_redirect! - assert_response :success - post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" } - assert_response :redirect - follow_redirect! - assert_response :success - - target_user = create(:user) - post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}" - assert_redirected_to user_path(target_user) - - reset! - end - - def check_success(action, user, role) - get "/login" - assert_response :redirect - assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true" - follow_redirect! - assert_response :success - post "/login", :params => { "username" => create(user).email, "password" => "test", :referer => "/" } - assert_response :redirect - follow_redirect! - assert_response :success - - target_user = create(:user) - post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}" - assert_redirected_to user_path(target_user) - - reset! - end -end