aboutsummaryrefslogtreecommitdiffstats
path: root/spec/models/outgoing_mailer_spec.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-02-01 22:04:58 +0000
committerRobin Houston <robin.houston@gmail.com>2012-02-01 22:04:58 +0000
commitea04caec95cea132143997a1870ae8dd1fc0db5c (patch)
treef199e3f4187091a7a7c78f7fd6901529658174f7 /spec/models/outgoing_mailer_spec.rb
parent59b5b15d56600ffc26d657dfea134ffcfc879725 (diff)
parenta76010c99459559a29901ed75b847384248c7c6e (diff)
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/models/outgoing_mailer_spec.rb')
-rw-r--r--spec/models/outgoing_mailer_spec.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/models/outgoing_mailer_spec.rb b/spec/models/outgoing_mailer_spec.rb
index 9b8fb5f98..5d1ea2dfb 100644
--- a/spec/models/outgoing_mailer_spec.rb
+++ b/spec/models/outgoing_mailer_spec.rb
@@ -4,7 +4,6 @@ describe OutgoingMailer, " when working out follow up addresses" do
# This is done with fixtures as the code is a bit tangled with the way it
# calls TMail. XXX untangle it and make these tests spread out and using
# mocks. Put parts of the tests in spec/lib/tmail_extensions.rb
- fixtures :public_bodies, :public_body_translations, :public_body_versions, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
before(:each) do
load_raw_emails_data
end
@@ -74,7 +73,6 @@ describe OutgoingMailer, " when working out follow up addresses" do
end
describe OutgoingMailer, "when working out follow up subjects" do
- fixtures :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things
before(:each) do
load_raw_emails_data