From 4165bc03624c3a3fff9c2275d3bb2a2bae70e8d9 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Fri, 10 Mar 2017 11:02:40 +0000 Subject: [PATCH] Use user factories for user_roles integration tests. --- test/integration/user_roles_test.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index edf1c7c4a..c2f065e0e 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -1,20 +1,18 @@ require "test_helper" 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, :user, :moderator) check_fail(:grant, :moderator_user, :moderator) check_success(:grant, :administrator_user, :moderator) end test "revoke" do - check_fail(:revoke, :public_user, :moderator) + 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) @@ -28,13 +26,14 @@ class UserRolesTest < ActionDispatch::IntegrationTest 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" => create(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 + target_user = create(:user) + post "/user/#{URI.encode(target_user.display_name)}/role/#{role}/#{action}" + assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name reset! end @@ -45,13 +44,14 @@ class UserRolesTest < ActionDispatch::IntegrationTest 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" => create(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 + target_user = create(:user) + post "/user/#{URI.encode(target_user.display_name)}/role/#{role}/#{action}" + assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name reset! end -- 2.39.5