Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop

Conflicts:
    Gemfile.lock

1 files changed, 2 insertions, 8 deletions

diff --git a/spec/support/load_file_fixtures.rb b/spec/support/load_file_fixtures.rb
index 08079f654..a54505e99 100644
--- a/spec/support/load_file_fixtures.rb
+++ b/spec/support/load_file_fixtures.rb
@@ -2,13 +2,7 @@ def file_fixture_name(file_name)
     return File.join(RSpec.configuration.fixture_path, "files", file_name)
 end
 
-def load_file_fixture(file_name, as_binary=false)
+def load_file_fixture(file_name)
     file_name = file_fixture_name(file_name)
-    content = File.open(file_name, 'r') do |file|
-        if as_binary
-            file.set_encoding(Encoding::BINARY) if file.respond_to?(:set_encoding)
-        end
-        file.read
-    end
-    return content
+    return File.open(file_name, 'rb') { |f| f.read }
 end