X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ea59d95f4aad7cafe3a0d0b4d5ef533b0662e365..a08fe1c2915722e70a695db244479c60157dd2b3:/test/controllers/site_controller_test.rb diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index b7571b1f5..6f6e7dcfa 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -7,14 +7,12 @@ class SiteControllerTest < ActionDispatch::IntegrationTest super Settings.id_key = create(:client_application).key - Settings.potlatch2_key = create(:client_application).key end ## # clear oauth keys def teardown Settings.id_key = nil - Settings.potlatch2_key = nil end ## @@ -180,7 +178,7 @@ class SiteControllerTest < ActionDispatch::IntegrationTest get edit_path assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => "/edit" + assert_redirected_to login_path(:referer => "/edit") end # Test the error when trying to edit without public edits @@ -454,7 +452,7 @@ class SiteControllerTest < ActionDispatch::IntegrationTest def test_welcome get welcome_path assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => "/welcome" + assert_redirected_to login_path(:referer => "/welcome") session_for(create(:user)) get welcome_path