Fix up missing fixtures (causing failures dependent on order the tests were funr). Also tidy up raw_email setup code to match everywhere.

7 files changed, 29 insertions, 17 deletions

diff --git a/spec/controllers/admin_request_controller_spec.rb b/spec/controllers/admin_request_controller_spec.rb
index 1d9ebcdf3..ee0acb637 100644
--- a/spec/controllers/admin_request_controller_spec.rb
+++ b/spec/controllers/admin_request_controller_spec.rb
@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AdminRequestController, "when administering requests" do
     integrate_views
-    fixtures :info_requests, :outgoing_messages, :users, :info_request_events
+    fixtures :info_requests, :outgoing_messages, :users, :info_request_events, :public_bodies, :public_body_translations
     before { basic_auth_login @request }
 
     it "shows the index/list page" do
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index bc744a9cd..76e1bb5e6 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -12,6 +12,10 @@ describe GeneralController, "when searching" do
                :incoming_messages,
                :comments ]
 
+    before(:each) do
+        load_raw_emails_data(raw_emails)
+    end
+
     it "should render the front page successfully" do
         get :frontpage
         response.should be_success
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 69c1433f2..4afc8f876 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -7,8 +7,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'json'
 
 describe RequestController, "when listing recent requests" do
-    
+    fixtures :info_requests, :outgoing_messages, :users, :info_request_events, :public_bodies, :public_body_translations, :incoming_messages, :raw_emails, :comments
+
     before(:each) do
+        load_raw_emails_data(raw_emails)
         rebuild_xapian_index
     end
     
@@ -496,7 +498,7 @@ describe RequestController, "when classifying an information request" do
 
     fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages, :comments # all needed as integrating views
 
-    before do 
+    before(:each) do 
         @dog_request = info_requests(:fancy_dog_request)
         @dog_request.stub!(:is_old_unclassified?).and_return(false)
         InfoRequest.stub!(:find).and_return(@dog_request)
@@ -831,7 +833,11 @@ end
 describe RequestController, "when sending a followup message" do
     integrate_views
     fixtures :info_requests, :info_request_events, :public_bodies, :public_body_translations, :users, :incoming_messages, :raw_emails, :outgoing_messages # all needed as integrating views
-  
+
+    before(:each) do
+        load_raw_emails_data(raw_emails)
+    end
+
     it "should require login" do
         post :show_response, :outgoing_message => { :body => "What a useless response! You suck.", :what_doing => 'normal_sort' }, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :submitted_followup => 1
         post_redirect = PostRedirect.get_last_post_redirect
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index f7002a9d4..2f3f903f9 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -37,14 +37,12 @@ describe TrackController, "when sending alerts for a track" do
     integrate_views
     fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :track_things_sent_emails, :public_bodies, :public_body_translations
     include LinkToHelper # for main_url
+
     before(:each) do
         load_raw_emails_data(raw_emails)
-    end
-    
-    before do
         rebuild_xapian_index
     end
-  
+    
     it "should send alerts" do
         # Don't do clever locale-insertion-unto-URL stuff
         ActionController::Routing::Routes.filters.clear
@@ -101,9 +99,9 @@ describe TrackController, "when viewing RSS feed for a track" do
     integrate_views
     fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations
 
-    before do
-        rebuild_xapian_index
+    before(:each) do
         load_raw_emails_data(raw_emails)
+        rebuild_xapian_index
     end
 
     it "should get the RSS feed" do
@@ -127,9 +125,9 @@ describe TrackController, "when viewing JSON version of a track feed" do
     integrate_views
     fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations
 
-    before do
-        rebuild_xapian_index
+    before(:each) do
         load_raw_emails_data(raw_emails)
+        rebuild_xapian_index
     end
 
     it "should get the feed" do
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index 42ea748fd..70d92356f 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe IncomingMessage, " when dealing with incoming mail" do
     fixtures :incoming_messages, :raw_emails, :info_requests
 
-    before do
+    before(:each) do
         @im = incoming_messages(:useless_incoming_message)
         load_raw_emails_data(raw_emails)
     end
@@ -112,7 +112,7 @@ end
 describe IncomingMessage, " when censoring data" do
     fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users
 
-    before do
+    before(:each) do
         @test_data = "There was a mouse called Stilton, he wished that he was blue."
 
         @im = incoming_messages(:useless_incoming_message)
@@ -204,7 +204,7 @@ end
 describe IncomingMessage, " when censoring whole users" do
     fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users
 
-    before do
+    before(:each) do
         @test_data = "There was a mouse called Stilton, he wished that he was blue."
 
         @im = incoming_messages(:useless_incoming_message)
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index ba80256ab..b82052a0f 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -5,7 +5,7 @@ describe InfoRequest do
     describe "guessing a request from an email" do 
         fixtures :info_requests, :public_bodies, :incoming_messages, :raw_emails
 
-        before do
+        before(:each) do
             @im = incoming_messages(:useless_incoming_message)
             load_raw_emails_data(raw_emails)
         end
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)