1 files changed, 26 insertions, 0 deletions
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 5f9ead973..847031674 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -2,6 +2,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RequestController, "when listing recent requests" do
+    before { ActionMailer::Base.deliveries = [] }
 
     before(:each) do
         load_raw_emails_data
@@ -120,6 +121,7 @@ describe RequestController, "when listing recent requests" do
 end
 
 describe RequestController, "when changing things that appear on the request page" do
+    before { ActionMailer::Base.deliveries = [] }
 
     render_views
 
@@ -187,6 +189,7 @@ describe RequestController, "when changing things that appear on the request pag
 end
 
 describe RequestController, "when showing one request" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before(:each) do
@@ -445,6 +448,8 @@ describe RequestController, "when showing one request" do
 
     describe 'when handling incoming mail' do
 
+        before { ActionMailer::Base.deliveries = [] }
+
         render_views
 
         it "should receive incoming messages, send email to creator, and show them" do
@@ -773,6 +778,7 @@ describe RequestController, "when showing one request" do
 end
 
 describe RequestController, "when changing prominence of a request" do
+    before { ActionMailer::Base.deliveries = [] }
 
     before(:each) do
         load_raw_emails_data
@@ -906,6 +912,7 @@ end
 #  end
 
 describe RequestController, "when searching for an authority" do
+    before { ActionMailer::Base.deliveries = [] }
 
     # Whether or not sign-in is required for this step is configurable,
     # so we make sure we're logged in, just in case
@@ -946,6 +953,8 @@ describe RequestController, "when searching for an authority" do
 end
 
 describe RequestController, "when creating a new request" do
+
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before do
@@ -1133,6 +1142,7 @@ end
 # These go with the previous set, but use mocks instead of fixtures.
 # TODO harmonise these
 describe RequestController, "when making a new request" do
+    before { ActionMailer::Base.deliveries = [] }
 
     before do
         @user = mock_model(User, :id => 3481, :name => 'Testy')
@@ -1182,6 +1192,7 @@ describe RequestController, "when making a new request" do
 end
 
 describe RequestController, "when viewing an individual response for reply/followup" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before(:each) do
@@ -1244,6 +1255,8 @@ describe RequestController, "when viewing an individual response for reply/follo
 end
 
 describe RequestController, "when classifying an information request" do
+    
+    before { ActionMailer::Base.deliveries = [] }
 
     describe 'if the request is external' do
 
@@ -1614,6 +1627,7 @@ describe RequestController, "when classifying an information request" do
 end
 
 describe RequestController, "when sending a followup message" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before(:each) do
@@ -1700,6 +1714,7 @@ describe RequestController, "sending overdue request alerts" do
 
     before(:each) do
         load_raw_emails_data
+        ActionMailer::Base.deliveries = []
     end
 
     it "should send an overdue alert mail to creators of overdue requests" do
@@ -1841,6 +1856,7 @@ describe RequestController, "sending overdue request alerts" do
 end
 
 describe RequestController, "sending unclassified new response reminder alerts" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before(:each) do
@@ -1871,6 +1887,7 @@ describe RequestController, "sending unclassified new response reminder alerts"
 end
 
 describe RequestController, "clarification required alerts" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
     before(:each) do
         load_raw_emails_data
@@ -1924,6 +1941,7 @@ describe RequestController, "clarification required alerts" do
 end
 
 describe RequestController, "comment alerts" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
     before(:each) do
         load_raw_emails_data
@@ -2003,6 +2021,7 @@ describe RequestController, "comment alerts" do
 end
 
 describe RequestController, "when viewing comments" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
     before(:each) do
         load_raw_emails_data
@@ -2030,6 +2049,7 @@ end
 
 
 describe RequestController, "authority uploads a response from the web interface" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before(:each) do
@@ -2120,6 +2140,7 @@ describe RequestController, "authority uploads a response from the web interface
 end
 
 describe RequestController, "when showing JSON version for API" do
+    before { ActionMailer::Base.deliveries = [] }
 
     before(:each) do
         load_raw_emails_data
@@ -2139,6 +2160,7 @@ describe RequestController, "when showing JSON version for API" do
 end
 
 describe RequestController, "when doing type ahead searches" do
+    before { ActionMailer::Base.deliveries = [] }
 
     render_views
 
@@ -2198,6 +2220,7 @@ describe RequestController, "when doing type ahead searches" do
 end
 
 describe RequestController, "when showing similar requests" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     it "should work" do
@@ -2232,6 +2255,7 @@ end
 
 
 describe RequestController, "when reporting a request when not logged in" do
+    before { ActionMailer::Base.deliveries = [] }
     it "should only allow logged-in users to report requests" do
         get :report_request, :url_title => info_requests(:badger_request).url_title
         post_redirect = PostRedirect.get_last_post_redirect
@@ -2240,6 +2264,7 @@ describe RequestController, "when reporting a request when not logged in" do
 end
 
 describe RequestController, "when reporting a request (logged in)" do
+    before { ActionMailer::Base.deliveries = [] }
     render_views
 
     before do
@@ -2316,6 +2341,7 @@ describe RequestController, "when reporting a request (logged in)" do
 end
 
 describe RequestController, "when caching fragments" do
+    before { ActionMailer::Base.deliveries = [] }
 
     it "should not fail with long filenames" do
         long_name = "blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah.txt"