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

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 73ae5f76c8350d2b63da9a2ff0e8f75ba479ade6..3a25c1a4b53162e6bf0acc1220cbaeacbe0dfe8b 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -4,7 +4,7 @@ class MessageTest < ActiveSupport::TestCase
   EURO = "\xe2\x82\xac".freeze # euro symbol
 
   def test_check_empty_message_fails
-    message = Message.new
+    message = build(:message, :title => nil, :body => nil, :sent_on => nil)
     assert_not message.valid?
     assert message.errors[:title].any?
     assert message.errors[:body].any?
@@ -32,7 +32,7 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_utf8_roundtrip
-    (1..255).each do |i|
+    [1, 255].each do |i|
       assert_message_ok("c", i)
       assert_message_ok(EURO, i)
     end
@@ -51,7 +51,7 @@ class MessageTest < ActiveSupport::TestCase
                          "\xC2\xC2",     # 2-byte multibyte identifier, followed by another one
                          "\x4a\x82",     # plain ASCII, followed by multibyte continuation
                          "\x82\x82",     # multibyte continuations without multibyte identifier
-                         "\xe1\x82\x4a"] # three-byte identifier, contination and (incorrectly) plain ASCII
+                         "\xe1\x82\x4a"] # three-byte identifier, continuation and (incorrectly) plain ASCII
     invalid_sequences.each do |char|
       # create a message and save to the database
       msg = make_message(char, 1)
@@ -64,7 +64,7 @@ class MessageTest < ActiveSupport::TestCase
       db_msg = msg.class.find(msg.id)
       assert_equal char, db_msg.title, "Database silently truncated message title"
     rescue ArgumentError => e
-      assert_equal e.to_s, "invalid byte sequence in UTF-8"
+      assert_equal("invalid byte sequence in UTF-8", e.to_s)
     end
   end