diff options
| author | Francis Irving <francis@mysociety.org> | 2009-12-03 11:23:32 +0000 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2009-12-03 11:23:32 +0000 |
| commit | e639fa544efc96c7707f43d382e09cb2aae9e28d (patch) | |
| tree | b9aa632be37772a4d8087de1b516dc2eadfd831b | |
| parent | debcab8798a7c389bbac9bfefbb133071b5a851e (diff) | |
Fix test to work with new way of uudecoding
| -rw-r--r-- | app/models/incoming_message.rb | 2 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index aab507074..2348c17b5 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -914,8 +914,6 @@ class IncomingMessage < ActiveRecord::Base IO.popen("/usr/bin/uudecode " + tempfile.path + " -o -", "r") do |child| content = child.read() end - STDERR.puts(tempfile.to_s) - raise "stop" tempfile.close # Make attachment type from it, working out filename and mime type attachment = FOIAttachment.new() diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 8bc22b58c..f08f1338c 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -191,9 +191,11 @@ end describe IncomingMessage, " when uudecoding bad messages" do it "should be able to do it at all" do mail_body = load_file_fixture('incoming-request-bad-uuencoding.email') + mail = TMail::Mail.parse(mail_body) + mail.base64_decode im = IncomingMessage.new - im.stub!(:get_main_body_text_internal).and_return(mail_body) + im.stub!(:mail).and_return(mail) ir = InfoRequest.new im.info_request = ir @@ -204,9 +206,11 @@ describe IncomingMessage, " when uudecoding bad messages" do it "should apply censor rules" do mail_body = load_file_fixture('incoming-request-bad-uuencoding.email') + mail = TMail::Mail.parse(mail_body) + mail.base64_decode im = IncomingMessage.new - im.stub!(:get_main_body_text_internal).and_return(mail_body) + im.stub!(:mail).and_return(mail) ir = InfoRequest.new im.info_request = ir |