Merge remote-tracking branch 'mysociety/develop' into rails-3-develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/admin_request_controller.rb
	app/controllers/admin_track_controller.rb
	app/controllers/request_controller.rb
	app/controllers/services_controller.rb
	app/helpers/link_to_helper.rb
	app/mailers/request_mailer.rb
	app/models/application_mailer.rb
	app/models/info_request.rb
	app/views/admin_censor_rule/edit.html.erb
	app/views/admin_censor_rule/new.html.erb
	app/views/admin_public_body/_form.html.erb
	app/views/admin_public_body/_locale_selector.html.erb
	app/views/admin_public_body/_one_list.html.erb
	app/views/admin_public_body/edit.html.erb
	app/views/admin_public_body/list.html.erb
	app/views/admin_public_body/new.html.erb
	app/views/admin_request/_incoming_message_actions.html.erb
	app/views/admin_request/edit.html.erb
	app/views/admin_request/edit_comment.html.erb
	app/views/admin_request/edit_outgoing.html.erb
	app/views/admin_request/list.html.erb
	app/views/admin_request/list_old_unclassified.html.erb
	app/views/admin_request/show.html.erb
	app/views/admin_track/_some_tracks.html.erb
	app/views/admin_track/list.html.erb
	app/views/admin_user/edit.html.erb
	app/views/admin_user/list.html.erb
	app/views/admin_user/show.html.erb
	app/views/general/_footer.html.erb
	app/views/general/exception_caught.html.erb
	app/views/help/contact.html.erb
	app/views/layouts/default.html.erb
	app/views/public_body/_alphabet.html.erb
	app/views/request/_request_listing_single.html.erb
	app/views/request/_sidebar.html.erb
	app/views/request/new.html.erb
	app/views/request/show.html.erb
	app/views/request_mailer/external_response.rhtml
	app/views/request_mailer/fake_response.rhtml
	config/environment.rb
	config/environments/production.rb
	config/routes.rb
	spec/controllers/admin_censor_rule_controller_spec.rb
	spec/controllers/request_controller_spec.rb
	spec/controllers/track_controller_spec.rb
	spec/helpers/link_to_helper_spec.rb
	spec/mailers/request_mailer_spec.rb
	spec/models/info_request_spec.rb
	spec/spec_helper.rb
	spec/views/public_body/show.html.erb_spec.rb
	spec/views/request/show.html.erb_spec.rb
	vendor/plugins/rails_xss/lib/rails_xss/erubis.rb

2 files changed, 37 insertions, 21 deletions

diff --git a/spec/script/mailin-spec.rb b/spec/script/mailin-spec.rb
deleted file mode 100644
index d80789635..000000000
--- a/spec/script/mailin-spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "external_command"
-
-def mailin_test(email_filename)
-    Dir.chdir Rails.root do
-        xc = ExternalCommand.new("script/mailin")
-        xc.run(load_file_fixture(email_filename))
-        xc.err.should == ""
-        return xc
-    end
-end
-
-describe "When importing mail into the application" do
-
-    it "should not produce any output and should return a 0 code on importing a plain email" do
-        r = mailin_test("incoming-request-plain.email")
-        r.status.should == 0
-        r.out.should == ""
-    end
-
-end
\ No newline at end of file
diff --git a/spec/script/mailin_spec.rb b/spec/script/mailin_spec.rb
new file mode 100644
index 000000000..acd06ff3b
--- /dev/null
+++ b/spec/script/mailin_spec.rb
@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "external_command"
+
+def mailin_test(email_filename)
+    Dir.chdir Rails.root do
+        xc = ExternalCommand.new("script/mailin")
+        mail = load_file_fixture(email_filename)
+        ir = info_requests(:other_request)
+        mail.gsub!('EMAIL_TO', ir.incoming_email)
+        mail.gsub!('EMAIL_FROM', 'responder@localhost')
+        xc.run(mail)
+        xc.err.should == ""
+        return xc
+    end
+end
+
+describe "When importing mail into the application" do
+
+    # Turn off transactional fixtures for this suite - incoming message is imported
+    # outside the transaction via ExternalCommand, so needs to be destroyed outside the
+    # transaction
+    self.use_transactional_fixtures = false
+
+    it "should not produce any output and should return a 0 code on importing a plain email" do
+        r = mailin_test("incoming-request-empty.email")
+        r.status.should == 0
+        r.out.should == ""
+    end
+
+    # Destroy the incoming message so that it doesn't affect other tests
+    after do
+        ir = info_requests(:other_request)
+        incoming_message = ir.incoming_messages[0]
+        incoming_message.fully_destroy
+    end
+
+end