diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 00:12:28 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 00:12:28 -0800 |
| commit | 49f08bb50c3da4ef900b3a98139425a705429a11 (patch) | |
| tree | df23294c95ed9165be03198221118e76ac830682 /actionpack/test/controller | |
| parent | b0011dc74b0f99a31d8f2104cf9224499c28199f (diff) | |
| parent | b74f5b73989edaca124b4b6f8594e63bda6344c9 (diff) | |
| download | rails-49f08bb50c3da4ef900b3a98139425a705429a11.tar.gz rails-49f08bb50c3da4ef900b3a98139425a705429a11.tar.bz2 rails-49f08bb50c3da4ef900b3a98139425a705429a11.zip | |
Merge pull request #4088 from rahul100885/rahul100885_work
Remove unused conditions for 1.9
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/test_test.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index b64e275363..0e75a23cfd 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -665,13 +665,8 @@ XML FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart' - if RUBY_VERSION < '1.9' - READ_BINARY = 'rb' - READ_PLAIN = 'r' - else - READ_BINARY = 'rb:binary' - READ_PLAIN = 'r:binary' - end + READ_BINARY = 'rb:binary' + READ_PLAIN = 'r:binary' def test_test_uploaded_file filename = 'mona_lisa.jpg' |