A bit of refactoring on person_spec since we got an odd failure on travis
This commit is contained in:
parent
c682eb8a7a
commit
c678f4732c
1 changed files with 16 additions and 16 deletions
|
|
@ -267,34 +267,34 @@ describe Person do
|
||||||
@casey_grippi.profile.save
|
@casey_grippi.profile.save
|
||||||
@casey_grippi.reload
|
@casey_grippi.reload
|
||||||
end
|
end
|
||||||
it 'is ordered by last name' do
|
it 'orders results by last name' do
|
||||||
@robert_grimm.profile.first_name = "AAA"
|
@robert_grimm.profile.first_name = "AAA"
|
||||||
@robert_grimm.profile.save
|
@robert_grimm.profile.save!
|
||||||
|
|
||||||
@eugene_weinstein.profile.first_name = "AAA"
|
@eugene_weinstein.profile.first_name = "AAA"
|
||||||
@eugene_weinstein.profile.save
|
@eugene_weinstein.profile.save!
|
||||||
|
|
||||||
@yevgeniy_dodis.profile.first_name = "AAA"
|
@yevgeniy_dodis.profile.first_name = "AAA"
|
||||||
@yevgeniy_dodis.profile.save
|
@yevgeniy_dodis.profile.save!
|
||||||
|
|
||||||
@casey_grippi.profile.first_name = "AAA"
|
@casey_grippi.profile.first_name = "AAA"
|
||||||
@casey_grippi.profile.save
|
@casey_grippi.profile.save!
|
||||||
|
|
||||||
people = Person.search("AAA", @user)
|
people = Person.search("AAA", @user)
|
||||||
people.map { |p| p.name }.should == [@yevgeniy_dodis, @robert_grimm, @casey_grippi, @eugene_weinstein].map { |p| p.name }
|
people.map { |p| p.name }.should == [@yevgeniy_dodis, @robert_grimm, @casey_grippi, @eugene_weinstein].map { |p| p.name }
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should return nothing on an empty query' do
|
it 'returns nothing on an empty query' do
|
||||||
people = Person.search("", @user)
|
people = Person.search("", @user)
|
||||||
people.empty?.should be true
|
people.should be_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should return nothing on a one character query' do
|
it 'returns nothing on a one-character query' do
|
||||||
people = Person.search("i", @user)
|
people = Person.search("i", @user)
|
||||||
people.empty?.should be true
|
people.should be_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should yield search results on partial names' do
|
it 'returns results for partial names' do
|
||||||
people = Person.search("Eug", @user)
|
people = Person.search("Eug", @user)
|
||||||
people.count.should == 1
|
people.count.should == 1
|
||||||
people.first.should == @eugene_weinstein
|
people.first.should == @eugene_weinstein
|
||||||
|
|
@ -309,7 +309,7 @@ describe Person do
|
||||||
people.second.should == @casey_grippi
|
people.second.should == @casey_grippi
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'gives results on full names' do
|
it 'returns results for full names' do
|
||||||
people = Person.search("Casey Grippi", @user)
|
people = Person.search("Casey Grippi", @user)
|
||||||
people.count.should == 1
|
people.count.should == 1
|
||||||
people.first.should == @casey_grippi
|
people.first.should == @casey_grippi
|
||||||
|
|
@ -321,23 +321,23 @@ describe Person do
|
||||||
Person.search("", @user).should_not include invisible_person
|
Person.search("", @user).should_not include invisible_person
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'searches on handles' do
|
it 'returns results for Diaspora handles' do
|
||||||
people = Person.search(@robert_grimm.diaspora_handle, @user)
|
people = Person.search(@robert_grimm.diaspora_handle, @user)
|
||||||
people.should == [@robert_grimm]
|
people.should == [@robert_grimm]
|
||||||
end
|
end
|
||||||
|
|
||||||
it "puts the searching user's contacts first" do
|
it "puts the searching user's contacts first" do
|
||||||
@robert_grimm.profile.first_name = "AAA"
|
@robert_grimm.profile.first_name = "AAA"
|
||||||
@robert_grimm.profile.save
|
@robert_grimm.profile.save!
|
||||||
|
|
||||||
@eugene_weinstein.profile.first_name = "AAA"
|
@eugene_weinstein.profile.first_name = "AAA"
|
||||||
@eugene_weinstein.profile.save
|
@eugene_weinstein.profile.save!
|
||||||
|
|
||||||
@yevgeniy_dodis.profile.first_name = "AAA"
|
@yevgeniy_dodis.profile.first_name = "AAA"
|
||||||
@yevgeniy_dodis.profile.save
|
@yevgeniy_dodis.profile.save!
|
||||||
|
|
||||||
@casey_grippi.profile.first_name = "AAA"
|
@casey_grippi.profile.first_name = "AAA"
|
||||||
@casey_grippi.profile.save
|
@casey_grippi.profile.save!
|
||||||
|
|
||||||
@user.contacts.create(:person => @casey_grippi, :aspects => [@user.aspects.first])
|
@user.contacts.create(:person => @casey_grippi, :aspects => [@user.aspects.first])
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue