Refactor login/logout into sessions controller

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

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index ff75df548e827b9bb2986be4620c9de713d96687..7d8f569f0ad089a070b191eb5fe879f4df13074f 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -6,27 +6,27 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   def test_routes
     assert_routing(
       { :path => "/login", :method => :get },
-      { :controller => "users", :action => "login" }
+      { :controller => "sessions", :action => "new" }
     )
     assert_routing(
       { :path => "/login", :method => :post },
-      { :controller => "users", :action => "login" }
+      { :controller => "sessions", :action => "create" }
     )
     assert_recognizes(
-      { :controller => "users", :action => "login", :format => "html" },
+      { :controller => "sessions", :action => "new", :format => "html" },
       { :path => "/login.html", :method => :get }
     )
 
     assert_routing(
       { :path => "/logout", :method => :get },
-      { :controller => "users", :action => "logout" }
+      { :controller => "sessions", :action => "destroy" }
     )
     assert_routing(
       { :path => "/logout", :method => :post },
-      { :controller => "users", :action => "logout" }
+      { :controller => "sessions", :action => "destroy" }
     )
     assert_recognizes(
-      { :controller => "users", :action => "logout", :format => "html" },
+      { :controller => "sessions", :action => "destroy", :format => "html" },
       { :path => "/logout.html", :method => :get }
     )
 
@@ -406,6 +406,25 @@ 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 "sessions/new"
+
+    get login_path, :params => { :username => user.display_name, :password => "test" }
+    assert_response :success
+    assert_template "sessions/new"
+
+    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
@@ -421,14 +440,14 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
   def test_logout_fallback_without_referer
     get logout_path
     assert_response :success
-    assert_template :logout
+    assert_template "sessions/destroy"
     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_template "sessions/destroy"
     assert_select "input[name=referer][value=?]", "/test"
   end
 
@@ -583,7 +602,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
 
@@ -828,7 +847,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
@@ -843,7 +862,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
@@ -870,7 +889,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
@@ -885,7 +904,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
@@ -941,7 +960,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))
@@ -1317,7 +1336,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)