diff options
| author | Mark Longair <mhl@pobox.com> | 2013-05-28 14:39:09 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-05-28 14:39:09 +0100 |
| commit | c248356a8e8a13513827381977b24f7406f96a8c (patch) | |
| tree | a0b2210c5956d0da8ea534fe8b772cd776087460 /spec/controllers/api_controller_spec.rb | |
| parent | ed03c3ef55fd61b9be3578ee0c93767d2c218b53 (diff) | |
| parent | 011e55bd4acf4f3c9de91c5ed4c646e855f19c24 (diff) | |
Merge branch 'tmail-to-mail-tests' into rails-3-develop
This merge brings in a number of tests and fixes for the handling
of mail under Mail / Rails 3 instead of TMail / Rails 2.
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'spec/controllers/api_controller_spec.rb')
| -rw-r--r-- | spec/controllers/api_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/api_controller_spec.rb b/spec/controllers/api_controller_spec.rb index 749be9f85..66b8e33f0 100644 --- a/spec/controllers/api_controller_spec.rb +++ b/spec/controllers/api_controller_spec.rb @@ -259,7 +259,7 @@ describe ApiController, "when using the API" do attachments.size.should == 1 attachment = attachments[0] attachment.filename.should == "tfl.pdf" - attachment.body.should == load_file_fixture("tfl.pdf", as_binary=true) + attachment.body.should == load_file_fixture("tfl.pdf") end it "should show information about a request" do |