Don't allow deleted users to be confirmed

[rails.git] / test / controllers / site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index b7571b1f54668ce9f03003e8b5e6d3b8b381f18f..6f6e7dcfa886c9af85a713029d104a51437c6f60 100644 (file)
--- 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