Correct a bunch of the testcases. Poor copy-and-paste led to description => nil where...

[selectricity-live] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
old mode 100755 (executable)
new mode 100644 (file)
index 64fd71c..78266ad
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,8 @@ class User < ActiveRecord::Base
 
   # Virtual attribute for the unencrypted password
   attr_accessor :password
 
   # Virtual attribute for the unencrypted password
   attr_accessor :password

-
+  attr_accessor :current_user
+  

   validates_presence_of     :login, :email
   validates_presence_of     :password,                   :if => :password_required?
   validates_presence_of     :password_confirmation,      :if => :password_required?
   validates_presence_of     :login, :email
   validates_presence_of     :password,                   :if => :password_required?
   validates_presence_of     :password_confirmation,      :if => :password_required?