DG MS; database seed scripts now ensure all friends are set to true
This commit is contained in:
parent
48adc9ebc1
commit
b052ddeb84
5 changed files with 15 additions and 5 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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]))
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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]))
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue