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

[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 a94a9a158c282bb791eb4670c308936693536650..914a4ab5608d32ce7fe343a2d6d5556ba47d3f31 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,19 +45,22 @@ 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_redirected_to root_path
+
+    post login_path, :params => { :username => "#{user.display_name} ", :password => "test" }
     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
 
@@ -80,11 +82,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     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
+    post logout_path
     assert_redirected_to root_path
   end
 end