Merge branch 'current-user-bug' of https://github.com/alindeman/hackety-hack.com into alindeman-current-user-bug

steveklabnik · steveklabnik · commit 30580d7476be · 2011-04-09T10:05:48.000-07:00
diff --git a/helpers.rb b/helpers.rb
@@ -19,8 +19,12 @@
   # keep track of that by just setting a session variable with their id. If it
   # doesn't exist, we just want to return nil.
   def current_user
-    return Hacker.first(:id => session[:hacker_id]) if session[:hacker_id]
-    nil
+    return nil unless session[:hacker_id]
+
+    # Memoize to make sure code like this works properly:
+    # current_user.password = 'foo'
+    # current_user.save
+    @current_user ||= Hacker.first(:id => session[:hacker_id]) if session[:hacker_id]
   end
 
   # This very simple method checks if we've got a logged in user. That's pretty
diff --git a/spec/acceptance/hacker_spec.rb b/spec/acceptance/hacker_spec.rb
@@ -92,4 +92,19 @@
     page.should have_content "Following: 0"
   end
 
+  scenario "can change password" do
+    @andy = Factory(:hacker, :username => "alindeman")
+    log_in @andy
+
+    visit "/hackers/alindeman"
+    fill_in "password[new]", :with => "abc123"
+    fill_in "password[confirm]", :with => "abc123"
+    click_button "Change password"
+
+    page.should have_content "Password updated!"
+
+    # Verify password was changed in the underlying datastore
+    Hacker.authenticate("alindeman", "abc123").should be
+  end
+
 end
