diff options
author | David Cabo <david@calibea.com> | 2011-07-30 02:42:59 +0200 |
---|---|---|
committer | David Cabo <david@calibea.com> | 2011-07-30 02:42:59 +0200 |
commit | 13035996a5a794051507f5927cb2f00104be34c0 (patch) | |
tree | 54b65e55f796c54cb623422c7d0d979ecdf072ca /spec/models/incoming_message_spec.rb | |
parent | a4ee2cfdc61aefda87f3585187cedc6f283505a6 (diff) | |
parent | faa8c8ed4a3de3ad5b41dc63a2d32dd4c92a444e (diff) |
Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu
Diffstat (limited to 'spec/models/incoming_message_spec.rb')
-rw-r--r-- | spec/models/incoming_message_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index abbe94a47..42ea748fd 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -1,10 +1,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe IncomingMessage, " when dealing with incoming mail" do - fixtures :incoming_messages, :raw_emails + fixtures :incoming_messages, :raw_emails, :info_requests 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 |