From ee89bfaf8f1681716a1f038e1d513b21c4ec6ca9 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 15 Sep 2010 16:16:44 -0700 Subject: [PATCH] removed do bad things --- app/models/user.rb | 5 ----- db/seeds/backer.rb | 1 + db/seeds/dev.rb | 2 ++ db/seeds/tom.rb | 2 ++ spec/models/aspect_spec.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 5f9bfb604..42bf732a6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -39,7 +39,6 @@ class User after_create :set_diaspora_handle after_create :seed_aspects - before_validation :do_bad_things before_save :downcase_username def self.find_for_authentication(conditions={}) @@ -314,10 +313,6 @@ class User "#{self.username}@#{self.terse_url}" end - def do_bad_things - self.password_confirmation = self.password - end - def setup_person self.person.serialized_key ||= User.generate_key.export self.person.save! diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index 1deb18f74..56781ca3d 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -24,6 +24,7 @@ def create user = User.create(:email => "#{username}@#{username}.joindiaspora.com", :username => username, :password => "#{username+backer_info[backer_number]['pin'].to_s}", + :password_confirmation => "#{username+backer_info[backer_number]['pin'].to_s}", :url=> "http://#{username}.joindiaspora.com/", :person => Person.new( :diaspora_handle => "#{username}@#{username}.joindiaspora.com", diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index 3c3cd3c45..483ae7556 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -12,6 +12,7 @@ url = "http://#{host}/" user = User.instantiate!( :email => "tom@tom.joindiaspora.com", :username => "tom", :password => "evankorth", + :password_confirmation => "evankorth", :url=> "http://#{username}.joindiaspora.com/" :person => Person.new( :diaspora_handle => "tom@tom.joindiaspora.com", @@ -24,6 +25,7 @@ user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com", :username => "korth", :url=> "http://#{username}.joindiaspora.com/" :password => "evankorth", + :password_confirmation => "evankorth", :person => Person.new( :diaspora_handle => "korth@tom.joindiaspora.com", :url => url, :profile => Profile.new( :first_name => "Evan", diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb index 928cffb4c..685cc35a6 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.rb @@ -11,6 +11,7 @@ remote_url = "http://tom.joindiaspora.com/" user = User.instantiate!( :email => "tom@tom.joindiaspora.com", :username => "tom", :password => "evankorth", + :password_confirmation => "evankorth", :url => remote_url, :person => { :diaspora_handle => "tom@tom.joindiaspora.com", @@ -22,6 +23,7 @@ user.person.save! user2 = User.instantiate!( :email => "korth@tom.joindiaspora.com", :password => "evankorth", + :password_confirmation => "evankorth", :username => "korth", :url => remote_url, :person => { :diaspora_handle => "korth@tom.joindiaspora.com", diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb index 4e6a5aea8..6bdbf8c1c 100644 --- a/spec/models/aspect_spec.rb +++ b/spec/models/aspect_spec.rb @@ -52,7 +52,7 @@ describe Aspect do it 'belong to a user' do @aspect.user.id.should == @user.id - @user.aspects.size.should == 1 + @user.aspects.size.should == 3 @user.aspects.first.id.should == @aspect.id end