X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0ff89c31e4f8a0c3fc31772c4cf914c4fd7f5656..c3cc8eb687e92c890a7c4801c262fb2e6c96ef0a:/test/controllers/site_controller_test.rb?ds=inline

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 4d08a8d0c..ccd8ba254 100644
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -1,20 +1,6 @@
 require "test_helper"
 
 class SiteControllerTest < ActionDispatch::IntegrationTest
-  ##
-  # setup oauth keys
-  def setup
-    super
-
-    Settings.id_key = create(:client_application).key
-  end
-
-  ##
-  # clear oauth keys
-  def teardown
-    Settings.id_key = nil
-  end
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -178,7 +164,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
@@ -452,7 +438,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
@@ -534,4 +520,12 @@ class SiteControllerTest < ActionDispatch::IntegrationTest
     assert_template "id"
     assert_template :layout => false
   end
+
+  # Test the id frame when not logged in
+  def test_id_without_login
+    get id_path
+
+    assert_response :redirect
+    assert_redirected_to login_path(:referer => "/id")
+  end
 end