From c678f4732c834a0f8c84faef2bfac7b960334767 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Sun, 4 Sep 2011 21:34:00 -0700
Subject: [PATCH] A bit of refactoring on person_spec since we got an odd
 failure on travis

---
 spec/models/person_spec.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 9706335c9..49237d638 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -267,34 +267,34 @@ describe Person do
       @casey_grippi.profile.save
       @casey_grippi.reload
     end
-    it 'is ordered by last name' do
+    it 'orders results by last name' do
       @robert_grimm.profile.first_name = "AAA"
-      @robert_grimm.profile.save
+      @robert_grimm.profile.save!
 
       @eugene_weinstein.profile.first_name = "AAA"
-      @eugene_weinstein.profile.save
+      @eugene_weinstein.profile.save!
 
       @yevgeniy_dodis.profile.first_name = "AAA"
-      @yevgeniy_dodis.profile.save
+      @yevgeniy_dodis.profile.save!
 
       @casey_grippi.profile.first_name = "AAA"
-      @casey_grippi.profile.save
+      @casey_grippi.profile.save!
 
       people = Person.search("AAA", @user)
       people.map { |p| p.name }.should == [@yevgeniy_dodis, @robert_grimm, @casey_grippi, @eugene_weinstein].map { |p| p.name }
     end
 
-    it 'should return nothing on an empty query' do
+    it 'returns nothing on an empty query' do
       people = Person.search("", @user)
-      people.empty?.should be true
+      people.should be_empty
     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.empty?.should be true
+      people.should be_empty
     end
 
-    it 'should yield search results on partial names' do
+    it 'returns results for partial names' do
       people = Person.search("Eug", @user)
       people.count.should == 1
       people.first.should == @eugene_weinstein
@@ -309,7 +309,7 @@ describe Person do
       people.second.should == @casey_grippi
     end
 
-    it 'gives results on full names' do
+    it 'returns results for full names' do
       people = Person.search("Casey Grippi", @user)
       people.count.should == 1
       people.first.should == @casey_grippi
@@ -321,23 +321,23 @@ describe Person do
       Person.search("", @user).should_not include invisible_person
     end
 
-    it 'searches on handles' do
+    it 'returns results for Diaspora handles' do
       people = Person.search(@robert_grimm.diaspora_handle, @user)
       people.should == [@robert_grimm]
     end
 
     it "puts the searching user's contacts first" do
       @robert_grimm.profile.first_name = "AAA"
-      @robert_grimm.profile.save
+      @robert_grimm.profile.save!
 
       @eugene_weinstein.profile.first_name = "AAA"
-      @eugene_weinstein.profile.save
+      @eugene_weinstein.profile.save!
 
       @yevgeniy_dodis.profile.first_name = "AAA"
-      @yevgeniy_dodis.profile.save
+      @yevgeniy_dodis.profile.save!
 
       @casey_grippi.profile.first_name = "AAA"
-      @casey_grippi.profile.save
+      @casey_grippi.profile.save!
 
       @user.contacts.create(:person => @casey_grippi, :aspects => [@user.aspects.first])