diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-01-29 19:13:34 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-01-29 19:13:34 +0000 |
commit | bbaa789b6c417300fbdace70ca93d7099c68b718 (patch) | |
tree | f15eb4eef728701dceddffe440a609302cac8d8d /spec/models/incoming_message_spec.rb | |
parent | d4c29c07ae46784ea1d564b749fb709c94a913f9 (diff) | |
parent | f6cd280bbfafa2151ededb8280407686fb73e8a7 (diff) |
Merge branch 'release/0.5' into wdtk
Diffstat (limited to 'spec/models/incoming_message_spec.rb')
-rw-r--r-- | spec/models/incoming_message_spec.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 7808ef24c..c096e61e0 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -6,7 +6,7 @@ describe IncomingMessage, " when dealing with incoming mail" do before(:each) do @im = incoming_messages(:useless_incoming_message) - load_raw_emails_data(raw_emails) + load_raw_emails_data end after(:all) do @@ -236,7 +236,7 @@ describe IncomingMessage, " when censoring data" do @censor_rule_2.last_edit_comment = "none" @im.info_request.censor_rules << @censor_rule_2 - load_raw_emails_data(raw_emails) + load_raw_emails_data end it "should do nothing to a JPEG" do @@ -336,7 +336,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) + load_raw_emails_data end it "should apply censor rules to HTML files" do @@ -357,7 +357,7 @@ describe IncomingMessage, " when uudecoding bad messages" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users, :foi_attachments before(:each) do - load_raw_emails_data(raw_emails) + load_raw_emails_data end it "should be able to do it at all" do @@ -401,7 +401,7 @@ describe IncomingMessage, "when messages are attached to messages" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users, :foi_attachments before(:each) do - load_raw_emails_data(raw_emails) + load_raw_emails_data end it "should flatten all the attachments out" do @@ -426,7 +426,7 @@ describe IncomingMessage, "when Outlook messages are attached to messages" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users, :foi_attachments before(:each) do - load_raw_emails_data(raw_emails) + load_raw_emails_data end it "should flatten all the attachments out" do @@ -449,7 +449,7 @@ describe IncomingMessage, "when TNEF attachments are attached to messages" do fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users, :foi_attachments before(:each) do - load_raw_emails_data(raw_emails) + load_raw_emails_data end it "should flatten all the attachments out" do |