Merge remote-tracking branch 'upstream/pull/5315'

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

diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index 71d6de184f0f53f6cf4d4bbe1aed1153732021ef..f490b748c4a6c763699d2759909ba06f52944e69 100644 (file)
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -35,7 +35,6 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
 
     get login_path
-    assert_response :redirect
     assert_redirected_to login_path(:cookie_test => true)
     follow_redirect!
     assert_response :success
@@ -46,27 +45,40 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     assert_template "sessions/new"
 
     post login_path, :params => { :username => user.display_name, :password => "test" }
-    assert_response :redirect
     assert_redirected_to root_path
 
     post login_path, :params => { :username => " #{user.display_name}", :password => "test" }
-    assert_response :redirect
     assert_redirected_to root_path
 
     post login_path, :params => { :username => "#{user.display_name} ", :password => "test" }
-    assert_response :redirect
     assert_redirected_to root_path
   end
 
+  def test_login_remembered
+    user = create(:user)
+
+    post login_path, :params => { :username => user.display_name, :password => "test", :remember_me => "yes" }
+    assert_redirected_to root_path
+
+    assert_equal 28 * 86400, session[:_remember_for]
+  end
+
+  def test_login_not_remembered
+    user = create(:user)
+
+    post login_path, :params => { :username => user.display_name, :password => "test", :remember_me => "0" }
+    assert_redirected_to root_path
+
+    assert_nil session[:_remember_for]
+  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
 
@@ -89,7 +101,6 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     post user_new_path, :params => { :user => user.attributes }
     post user_save_path, :params => { :read_ct => 1, :read_tou => 1 }
     post logout_path
-    assert_response :redirect
     assert_redirected_to root_path
   end
 end