More test data, and fix tests

Add some more test data, and fix the tests to accommodate both this
new test data and the fact that raw emails are now correctly loaded
into the test environment.

1 files changed, 10 insertions, 5 deletions

diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index bf9888685..a285a8900 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -199,6 +199,11 @@ describe PublicBodyController, "when doing type ahead searches" do
     fixtures :public_bodies, :public_body_translations, :public_body_versions, :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
 
     integrate_views
+    
+    before(:each) do
+        load_raw_emails_data
+        rebuild_xapian_index
+    end
 
     it "should return nothing for the empty query string" do
         get :search_typeahead, :query => ""
@@ -217,16 +222,16 @@ describe PublicBodyController, "when doing type ahead searches" do
     it "should return all requests matching any of the given keywords" do
         get :search_typeahead, :query => "Geraldine Humpadinking"
         response.should render_template('public_body/_search_ahead')
-        assigns[:xapian_requests].results.size.should == 2
-        assigns[:xapian_requests].results[0][:model].name.should == public_bodies(:humpadink_public_body).name
-        assigns[:xapian_requests].results[1][:model].name.should == public_bodies(:geraldine_public_body).name
+        assigns[:xapian_requests].results.map{|x|x[:model]}.should =~ [
+            public_bodies(:humpadink_public_body),
+            public_bodies(:geraldine_public_body),
+        ]
     end
 
     it "should return requests matching the given keywords in any of their locales" do
         get :search_typeahead, :query => "baguette" # part of the spanish notes
         response.should render_template('public_body/_search_ahead')
-        assigns[:xapian_requests].results.size.should == 1
-        assigns[:xapian_requests].results[0][:model].name.should == public_bodies(:humpadink_public_body).name
+        assigns[:xapian_requests].results.map{|x|x[:model]}.should =~ [public_bodies(:humpadink_public_body)]
     end
 
     it "should not return  matches for short words" do