Fixed global sign out; Fixed invalid controller test case;

* The cookie wasn't initalized correctly in the test's setup causing mistaken acceptance * The order of remember token reset in relation to the cookie cleanup was backwards in the sign_out
marcocampana · Feb 19, 2010 · 90cecbc · 90cecbc
1 parent 63e3225
commit 90cecbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/clearance/authentication.rb b/lib/clearance/authentication.rb
@@ -75,8 +75,8 @@ def sign_in(user)
       # @example
       #   sign_out
       def sign_out
-        cookies.delete(:remember_token)
         current_user.reset_remember_token! if current_user
+        cookies.delete(:remember_token)
         current_user = nil
       end
 

diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
@@ -123,8 +123,7 @@ class SessionsControllerTest < ActionController::TestCase
     setup do
       @user = Factory(:email_confirmed_user)
       @user.update_attribute(:remember_token, "old-token")
-      cookies['remember_token'] = CGI::Cookie.new('token', 'value')
+      @request.cookies["remember_token"] = "old-token"
-      sign_in_as @user
       delete :destroy
     end