aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/api_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-05-28 15:14:44 +0100
committerLouise Crow <louise.crow@gmail.com>2013-05-28 15:14:44 +0100
commitef682f7d7c3402713efea88775b246c3c7960aa2 (patch)
treee4918a75cf1a24eecaab287602cf561245b611fc /spec/controllers/api_controller_spec.rb
parent988becbb62e42feb9b62af27cdb2ec67b409032a (diff)
parentc248356a8e8a13513827381977b24f7406f96a8c (diff)
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Conflicts: Gemfile.lock
Diffstat (limited to 'spec/controllers/api_controller_spec.rb')
-rw-r--r--spec/controllers/api_controller_spec.rb2
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