Merge remote-tracking branch 'upstream/pull/2709'

[rails.git] / test / models / message_test.rb

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 9c321d3c39c7ff5c317a14235d393c40d011ae5d..60ff19e4467e616c1cb2a91608dddbf016fdcd6d 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -63,8 +63,8 @@ class MessageTest < ActiveSupport::TestCase
       # its OK to accept invalid UTF-8 as long as we return it unmodified.
       db_msg = msg.class.find(msg.id)
       assert_equal char, db_msg.title, "Database silently truncated message title"
-    rescue ArgumentError => ex
-      assert_equal ex.to_s, "invalid byte sequence in UTF-8"
+    rescue ArgumentError => e
+      assert_equal e.to_s, "invalid byte sequence in UTF-8"
     end
   end