X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb3c4ec09b70e7eae62494af795187b32128fd0c..90ac07d071ed8dbfdea6214419e1b5205a529b2f:/test/models/message_test.rb diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 48319843b..60ff19e44 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -53,20 +53,18 @@ class MessageTest < ActiveSupport::TestCase "\x82\x82", # multibyte continuations without multibyte identifier "\xe1\x82\x4a"] # three-byte identifier, contination and (incorrectly) plain ASCII invalid_sequences.each do |char| - begin - # create a message and save to the database - msg = make_message(char, 1) - # if the save throws, thats fine and the test should pass, as we're - # only testing invalid sequences anyway. - msg.save! - - # get the saved message back and check that it is identical - i.e: - # 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" - end + # create a message and save to the database + msg = make_message(char, 1) + # if the save throws, thats fine and the test should pass, as we're + # only testing invalid sequences anyway. + msg.save! + + # get the saved message back and check that it is identical - i.e: + # 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 => e + assert_equal e.to_s, "invalid byte sequence in UTF-8" end end @@ -106,7 +104,7 @@ class MessageTest < ActiveSupport::TestCase assert_equal recipient_user, message.recipient assert_equal mail.date, message.sent_on assert_equal "Test message", message.title - assert_match /^ *This is a test & a message *$/, message.body + assert_match(/^ *This is a test & a message *$/, message.body) assert_equal "text", message.body_format end @@ -153,7 +151,7 @@ class MessageTest < ActiveSupport::TestCase assert_equal recipient_user, message.recipient assert_equal mail.date, message.sent_on assert_equal "Test message", message.title - assert_match /^ *This is a test & a message in HTML format *$/, message.body + assert_match(/^ *This is a test & a message in HTML format *$/, message.body) assert_equal "text", message.body_format end