aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-15 03:19:21 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-15 03:19:21 -0700
commit078bdc6ded46fa1de57ae55031bf5e9a9fd897c8 (patch)
tree654f5c01a53ad9784744cbad137cacd72e84b378
parent6ab3da62083773cc507851694324cfb413f07ea8 (diff)
parentc0d82ba03018795433e7443131705cb03d7ee4c7 (diff)
downloadrails-078bdc6ded46fa1de57ae55031bf5e9a9fd897c8.tar.gz
rails-078bdc6ded46fa1de57ae55031bf5e9a9fd897c8.tar.bz2
rails-078bdc6ded46fa1de57ae55031bf5e9a9fd897c8.zip
Merge pull request #1711 from daeltar/master
Use assert_equal instead of assert in uploaded file test.
-rw-r--r--actionpack/test/dispatch/uploaded_file_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 44c15694f7..7e4a1519fb 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -16,7 +16,7 @@ module ActionDispatch
if "ruby".encoding_aware?
def test_filename_should_be_in_utf_8
uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
- assert "UTF-8", uf.original_filename.encoding.to_s
+ assert_equal "UTF-8", uf.original_filename.encoding.to_s
end
end