diff options
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/outgoing_mailer_spec.rb | 12 | ||||
| -rw-r--r-- | spec/models/request_mailer_spec.rb | 3 | ||||
| -rw-r--r-- | spec/models/xapian_spec.rb | 18 |
4 files changed, 30 insertions, 7 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index abbe94a47..68ef541a4 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -5,6 +5,7 @@ describe IncomingMessage, " when dealing with incoming mail" do before do @im = incoming_messages(:useless_incoming_message) + load_raw_emails_data(raw_emails) end it "should return the mail Date header date for sent at" do @@ -129,6 +130,8 @@ describe IncomingMessage, " when censoring data" do @censor_rule_2.last_edit_editor = "unknown" @censor_rule_2.last_edit_comment = "none" @im.info_request.censor_rules << @censor_rule_2 + + load_raw_emails_data(raw_emails) end it "should do nothing to a JPEG" do @@ -212,6 +215,7 @@ describe IncomingMessage, " when censoring whole users" do @censor_rule_1.last_edit_editor = "unknown" @censor_rule_1.last_edit_comment = "none" @im.info_request.user.censor_rules << @censor_rule_1 + load_raw_emails_data(raw_emails) end it "should apply censor rules to HTML files" do diff --git a/spec/models/outgoing_mailer_spec.rb b/spec/models/outgoing_mailer_spec.rb index 24143fc9b..d7587cb41 100644 --- a/spec/models/outgoing_mailer_spec.rb +++ b/spec/models/outgoing_mailer_spec.rb @@ -5,6 +5,9 @@ describe OutgoingMailer, " when working out follow up addresses" do # 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 :info_requests, :incoming_messages, :raw_emails, :public_bodies, :public_body_translations + before(:each) do + load_raw_emails_data(raw_emails) + end it "should parse them right" do ir = info_requests(:fancy_dog_request) @@ -69,13 +72,8 @@ end describe OutgoingMailer, "when working out follow up subjects" do fixtures :info_requests, :incoming_messages, :outgoing_messages, :raw_emails - before do - raw_email = raw_emails(:useless_raw_email) - raw_email.data=raw_email.dbdata - end - - after do - raw_emails(:useless_raw_email).destroy_file_representation! + before(:each) do + load_raw_emails_data(raw_emails) end it "should prefix the title with 'Freedom of Information request -' for initial requests" do diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index a8311e8f8..a5f59b9bf 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -2,6 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe RequestMailer, " when receiving incoming mail" do fixtures :info_requests, :incoming_messages, :raw_emails, :users, :public_bodies, :public_body_translations + before(:each) do + load_raw_emails_data(raw_emails) + end it "should append it to the appropriate request" do ir = info_requests(:fancy_dog_request) diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb index 79ffc4839..37e68b145 100644 --- a/spec/models/xapian_spec.rb +++ b/spec/models/xapian_spec.rb @@ -35,6 +35,9 @@ end describe PublicBody, " when indexing public bodies with Xapian" do fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end it "should search index the main name field" do rebuild_xapian_index @@ -126,6 +129,9 @@ end describe User, " when indexing requests by user they are from" do fixtures :users, :info_request_events, :info_requests, :incoming_messages, :outgoing_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end it "should find requests from the user" do rebuild_xapian_index @@ -210,6 +216,9 @@ end describe User, " when indexing comments by user they are by" do fixtures :users, :info_request_events, :info_requests, :comments, :incoming_messages, :outgoing_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end it "should find requests from the user" do rebuild_xapian_index @@ -244,6 +253,9 @@ end describe InfoRequest, " when indexing requests by their title" do fixtures :info_request_events, :info_requests, :incoming_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end it "should find events for the request" do rebuild_xapian_index @@ -272,6 +284,9 @@ end describe InfoRequest, " when indexing requests by tag" do fixtures :info_request_events, :info_requests, :incoming_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end it "should find request by tag, even when changes" do rebuild_xapian_index @@ -291,6 +306,9 @@ end describe PublicBody, " when indexing authorities by tag" do fixtures :public_bodies, :public_body_translations, :incoming_messages, :outgoing_messages, :raw_emails, :comments + before(:each) do + load_raw_emails_data(raw_emails) + end it "should find request by tag, even when changes" do rebuild_xapian_index |