Merge branch 'sign-in-out'

Conflicts: spec/requests/users_spec.rb
chriserin · Oct 1, 2010 · 3da621f · 3da621f
2 parents cd648f9 + 027bfdb
commit 3da621f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
@@ -19,7 +19,7 @@ def signed_in?
 
   def sign_out
     cookies.delete(:remember_token)
-    self.current_user = nil
+    current_user = nil
   end
 
   def current_user?(user)

diff --git a/spec/requests/users_spec.rb b/spec/requests/users_spec.rb
@@ -37,7 +37,7 @@
   end
 
   describe "signin" do
-
+    
     describe "failure" do
       it "should not sign a user in" do
         visit signin_path