X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f136a84a60ea11218cd034e50269a1d35d5a2e9..d7eac9b5a8f4cbbeb4ed3d73464993bfd5888935:/test/controllers/users_controller_test.rb

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 54c737b97..6cefcaa93 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -4,32 +4,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   ##
   # test all routes which lead to this controller
   def test_routes
-    assert_routing(
-      { :path => "/login", :method => :get },
-      { :controller => "users", :action => "login" }
-    )
-    assert_routing(
-      { :path => "/login", :method => :post },
-      { :controller => "users", :action => "login" }
-    )
-    assert_recognizes(
-      { :controller => "users", :action => "login", :format => "html" },
-      { :path => "/login.html", :method => :get }
-    )
-
-    assert_routing(
-      { :path => "/logout", :method => :get },
-      { :controller => "users", :action => "logout" }
-    )
-    assert_routing(
-      { :path => "/logout", :method => :post },
-      { :controller => "users", :action => "logout" }
-    )
-    assert_recognizes(
-      { :controller => "users", :action => "logout", :format => "html" },
-      { :path => "/logout.html", :method => :get }
-    )
-
     assert_routing(
       { :path => "/user/new", :method => :get },
       { :controller => "users", :action => "new" }
@@ -406,63 +380,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
   end
 
-  def test_login
-    user = create(:user)
-
-    get login_path
-    assert_response :redirect
-    assert_redirected_to login_path(:cookie_test => true)
-    follow_redirect!
-    assert_response :success
-    assert_template "login"
-
-    get login_path, :params => { :username => user.display_name, :password => "test" }
-    assert_response :success
-    assert_template "login"
-
-    post login_path, :params => { :username => user.display_name, :password => "test" }
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
-  def test_logout_without_referer
-    post logout_path
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
-  def test_logout_with_referer
-    post logout_path, :params => { :referer => "/test" }
-    assert_response :redirect
-    assert_redirected_to "/test"
-  end
-
-  def test_logout_fallback_without_referer
-    get logout_path
-    assert_response :success
-    assert_template :logout
-    assert_select "input[name=referer]:not([value])"
-  end
-
-  def test_logout_fallback_with_referer
-    get logout_path, :params => { :referer => "/test" }
-    assert_response :success
-    assert_template :logout
-    assert_select "input[name=referer][value=?]", "/test"
-  end
-
-  def test_logout_removes_session_token
-    user = build(:user, :pending)
-    post user_new_path, :params => { :user => user.attributes }
-    post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
-
-    assert_difference "User.find_by(:email => user.email).tokens.count", -1 do
-      post logout_path
-    end
-    assert_response :redirect
-    assert_redirected_to root_path
-  end
-
   def test_confirm_get
     user = build(:user, :pending)
     post user_new_path, :params => { :user => user.attributes }
@@ -602,7 +519,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
 
     confirm_string = User.find_by(:email => user.email).tokens.create(:referer => new_diary_entry_path).token
     post user_confirm_path, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
-    assert_redirected_to :action => "login"
+    assert_redirected_to login_path
     assert_match(/already been confirmed/, flash[:error])
   end
 
@@ -847,7 +764,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
-    assert_redirected_to :action => :login
+    assert_redirected_to login_path
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
@@ -862,7 +779,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
-    assert_redirected_to :action => :login
+    assert_redirected_to login_path
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
@@ -889,7 +806,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
-    assert_redirected_to :action => :login
+    assert_redirected_to login_path
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
@@ -904,7 +821,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
       end
     end
     assert_response :redirect
-    assert_redirected_to :action => :login
+    assert_redirected_to login_path
     assert_match(/^Sorry you lost it/, flash[:notice])
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
@@ -960,7 +877,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # you are not logged in
     get user_account_path(user)
     assert_response :redirect
-    assert_redirected_to :action => "login", :referer => "/user/#{ERB::Util.u(user.display_name)}/account"
+    assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(user.display_name)}/account")
 
     # Make sure that you are blocked when not logged in as the right user
     session_for(create(:user))
@@ -1336,7 +1253,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
     # Shouldn't work when not logged in
     get users_path
     assert_response :redirect
-    assert_redirected_to :action => :login, :referer => users_path
+    assert_redirected_to login_path(:referer => users_path)
 
     session_for(user)