Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu

Conflicts:
	locale/cy/app.po
	locale/de/app.po
	locale/es/app.po
	locale/fr/app.po
	locale/sq/app.po
	locale/sr/app.po
	locale/sr@latin/app.po

1 files changed, 5 insertions, 1 deletions

diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb
index 37e68b145..0c6fa6bb6 100644
--- a/spec/models/xapian_spec.rb
+++ b/spec/models/xapian_spec.rb
@@ -34,7 +34,7 @@ describe User, " when indexing users with Xapian" do
 end
 
 describe PublicBody, " when indexing public bodies with Xapian" do
-    fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments
+    fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments, :info_requests
     before(:each) do
         load_raw_emails_data(raw_emails)
     end
@@ -74,6 +74,10 @@ end
 describe PublicBody, " when indexing requests by body they are to" do
     fixtures :public_bodies, :public_body_translations, :info_request_events, :info_requests, :raw_emails, :comments
 
+    before(:each) do
+        load_raw_emails_data(raw_emails)
+    end
+
     it "should find requests to the body" do
         rebuild_xapian_index
         xapian_object = InfoRequest.full_search([InfoRequestEvent], "requested_from:tgq", 'created_at', true, nil, 100, 1)