diff --git a/app/models/person.rb b/app/models/person.rb index 082bf80a2..688e8fb8b 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -24,7 +24,7 @@ class Person #validates_uniqueness_of :url validates_true_for :url, :logic => lambda { self.url_unique?} - scope :friends, where(:_type => "Person") + scope :friends, where(:_type => "Person", :active => true) validates_presence_of :email before_validation :clean_url diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index c9335e8c5..a4d5c48d4 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -55,12 +55,12 @@ def create(backer_number, password) user = User.create( :email => "#{email}@joindiaspora.com", :password => "#{email+backer_info[backer_number][0].to_s}", :profile => Profile.create( :first_name => backer_info[backer_number][1], :last_name => backer_info[backer_number][2] )) # Make connection with Diaspora Tom - Person.create( :email => "tom@joindiaspora.com", :url => "http://tom.joindiaspora.com/", :profile => Profile.create(:first_name => "Alexander", :last_name => "Hamiltom")) + Person.create( :email => "tom@joindiaspora.com", :url => "http://tom.joindiaspora.com/", :active => true, :profile => Profile.create(:first_name => "Alexander", :last_name => "Hamiltom")) # Make people (0..10).each { |n| email = backer_info[n][2].gsub(/ /,'').downcase - Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :profile => Profile.create(:first_name => backer_info[n][1], :last_name => backer_info[n][2])) unless n == backer_number + Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :active => true, :profile => Profile.create(:first_name => backer_info[n][1], :last_name => backer_info[n][2])) unless n == backer_number } end diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index 89b1a4376..d5a71b3c7 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -52,7 +52,7 @@ names = [ ["George", "Washington"], # Make people (0..10).each { |n| email = names[n][1].gsub(/ /,'').downcase - Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :profile => Profile.create(:first_name => names[n][0], :last_name => names[n][1])) + Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :active => true, :profile => Profile.create(:first_name => names[n][0], :last_name => names[n][1])) } diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb index 4121cebdc..85170c013 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.rb @@ -52,7 +52,7 @@ names = [ ["George", "Washington"], # Make people (0..10).each { |n| email = names[n][1].gsub(/ /,'').downcase - Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :profile => Profile.create(:first_name => names[n][0], :last_name => names[n][1])) + Person.create( :email => "#{email}@joindiaspora.com", :url => "http://#{email}.joindiaspora.com/", :active => true, :profile => Profile.create(:first_name => names[n][0], :last_name => names[n][1])) } diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 9218313db..9e9b40abe 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -24,4 +24,14 @@ describe Person do xml = person.to_xml.to_s (xml.include? "first_name").should == true end + + it 'should only return active friends' do + Factory.create(:person, :active => true) + Factory.create(:person) + Factory.create(:person) + + Person.friends.all.count.should == 1 + end + + end