Merge branch 'fix-xapian-spec-failures' into rails-3-develop

2 files changed, 4 insertions, 7 deletions

diff --git a/spec/integration/xapian_search_highlighting_spec.rb b/spec/integration/xapian_search_highlighting_spec.rb
index 65a34cf91..b2994eb31 100644
--- a/spec/integration/xapian_search_highlighting_spec.rb
+++ b/spec/integration/xapian_search_highlighting_spec.rb
@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe 'highlighting search results' do
     include HighlightHelper
 
+    before do
+        get_fixtures_xapian_index
+    end
+
     it 'ignores stopwords' do
         phrase = 'department of humpadinking'
         search = ActsAsXapian::Search.new([PublicBody], phrase, :limit => 1)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 93bcfa1ba..4df1b5649 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -124,13 +124,6 @@ Spork.prefork do
     end
   end
 
-  # TODO: No idea what namespace/class/module to put this in
-  # Create a clean xapian index based on the fixture files and the raw_email data.
-  def create_fixtures_xapian_index
-      load_raw_emails_data
-      rebuild_xapian_index
-  end
-
   # Use the before create job hook to simulate a race condition with
   # another process by creating an acts_as_xapian_job record for the
   # same model: