5 files changed, 8 insertions, 11 deletions
diff --git a/spec/integration/admin_public_body_edit_spec.rb b/spec/integration/admin_public_body_edit_spec.rb
index aeec3e65a..21011b172 100644
--- a/spec/integration/admin_public_body_edit_spec.rb
+++ b/spec/integration/admin_public_body_edit_spec.rb
@@ -39,7 +39,7 @@ describe 'Editing a Public Body' do
         end
     end
 
-    it 'can add a translation for multiple locales', :focus => true do
+    it 'can add a translation for multiple locales' do
         @admin.visit edit_admin_body_path(@body)
         @admin.fill_in 'public_body_name__en', :with => 'New Quango EN'
         @admin.click_button 'Save'
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/lib/mail_handler/mail_handler_spec.rb b/spec/lib/mail_handler/mail_handler_spec.rb
index e7ad93300..ea7a99b05 100644
--- a/spec/lib/mail_handler/mail_handler_spec.rb
+++ b/spec/lib/mail_handler/mail_handler_spec.rb
@@ -9,7 +9,7 @@ end
 
 describe 'when creating a mail object from raw data' do
 
-    it "should be able to parse a large email without raising an exception", :focus => true do
+    it "should be able to parse a large email without raising an exception" do
         m = Mail.new
         m.add_file(:filename => "attachment.data", :content => "a" * (8 * 1024 * 1024))
         raw_email = "From jamis_buck@byu.edu Mon May  2 16:07:05 2005\r\n#{m.to_s}"
@@ -22,7 +22,7 @@ describe 'when creating a mail object from raw data' do
         mail.multipart?.should == true
     end
 
-    it "should not fail on invalid byte sequence in content-disposition header", :focus => true do
+    it "should not fail on invalid byte sequence in content-disposition header" do
       part = Mail::Part.new("Content-Disposition: inline; filename=a\xB8z\r\n\r\nThis is the body text.")
       lambda { part.inline? }.should_not raise_error
     end
diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb
index 2881e7745..701422037 100644
--- a/spec/models/info_request_batch_spec.rb
+++ b/spec/models/info_request_batch_spec.rb
@@ -80,7 +80,7 @@ describe InfoRequestBatch, "when finding an existing batch" do
     end
 end
 
-describe InfoRequestBatch, "when creating a batch", :focus => true do
+describe InfoRequestBatch, "when creating a batch" do
 
     before do
         @title = 'A test title'
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: