X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/98184dfb9cacc74ac5bcb91a41a2d5804b3f4f7d..35fbcf28154b6f15f697018016fbabc952e018a5:/test/models/message_test.rb diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 079e10c42..81290a14a 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -require 'test_helper' +require "test_helper" class MessageTest < ActiveSupport::TestCase api_fixtures fixtures :messages - EURO = "\xe2\x82\xac" #euro symbol + EURO = "\xe2\x82\xac" # euro symbol # This needs to be updated when new fixtures are added # or removed. @@ -21,14 +21,14 @@ class MessageTest < ActiveSupport::TestCase assert message.errors[:sent_on].any? assert !message.message_read end - + def test_validating_msgs message = messages(:unread_message) assert message.valid? - massage = messages(:read_message) + message = messages(:read_message) assert message.valid? end - + def test_invalid_send_recipient message = messages(:unread_message) message.sender = nil @@ -38,24 +38,24 @@ class MessageTest < ActiveSupport::TestCase assert_raise(ActiveRecord::RecordNotFound) { User.find(0) } message.from_user_id = 0 message.to_user_id = 0 - assert_raise(ActiveRecord::RecordInvalid) {message.save!} + assert_raise(ActiveRecord::RecordInvalid) { message.save! } end def test_utf8_roundtrip (1..255).each do |i| - assert_message_ok('c', i) + assert_message_ok("c", i) assert_message_ok(EURO, i) end end def test_length_oversize - assert_raise(ActiveRecord::RecordInvalid) { make_message('c', 256).save! } + assert_raise(ActiveRecord::RecordInvalid) { make_message("c", 256).save! } assert_raise(ActiveRecord::RecordInvalid) { make_message(EURO, 256).save! } end def test_invalid_utf8 # See e.g http://en.wikipedia.org/wiki/UTF-8 for byte sequences - # FIXME - Invalid Unicode characters can still be encoded into "valid" utf-8 byte sequences - maybe check this too? + # FIXME: Invalid Unicode characters can still be encoded into "valid" utf-8 byte sequences - maybe check this too? invalid_sequences = ["\xC0", # always invalid utf8 "\xC2\x4a", # 2-byte multibyte identifier, followed by plain ASCII "\xC2\xC2", # 2-byte multibyte identifier, followed by another one @@ -69,9 +69,9 @@ class MessageTest < ActiveSupport::TestCase 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! + msg.save! - # get the saved message back and check that it is identical - i.e: + # 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" @@ -79,11 +79,9 @@ class MessageTest < ActiveSupport::TestCase rescue ArgumentError => ex assert_equal ex.to_s, "invalid byte sequence in UTF-8" - rescue ActiveRecord::RecordInvalid - # because we only test invalid sequences it is OK to barf on them end end - end + end def test_from_mail_plain mail = Mail.new do @@ -91,7 +89,7 @@ class MessageTest < ActiveSupport::TestCase to "to@example.com" subject "Test message" date Time.now - content_type 'text/plain; charset=utf-8' + content_type "text/plain; charset=utf-8" body "This is a test & a message" end message = Message.from_mail(mail, users(:normal_user), users(:public_user)) @@ -109,7 +107,7 @@ class MessageTest < ActiveSupport::TestCase to "to@example.com" subject "Test message" date Time.now - content_type 'text/html; charset=utf-8' + content_type "text/html; charset=utf-8" body "
This is a test & a message
" end message = Message.from_mail(mail, users(:normal_user), users(:public_user)) @@ -129,12 +127,12 @@ class MessageTest < ActiveSupport::TestCase date Time.now text_part do - content_type 'text/plain; charset=utf-8' + content_type "text/plain; charset=utf-8" body "This is a test & a message in text format" end html_part do - content_type 'text/html; charset=utf-8' + content_type "text/html; charset=utf-8" body "This is a test & a message in HTML format
" end end @@ -153,7 +151,7 @@ class MessageTest < ActiveSupport::TestCase date Time.now html_part do - content_type 'text/html; charset=utf-8' + content_type "text/html; charset=utf-8" body "This is a test & a message in HTML format
" end end @@ -172,7 +170,7 @@ class MessageTest < ActiveSupport::TestCase to "to@example.com" subject "[OpenStreetMap] Test message" date Time.now - content_type 'text/plain; charset=utf-8' + content_type "text/plain; charset=utf-8" body "This is a test & a message" end message = Message.from_mail(mail, users(:normal_user), users(:public_user)) @@ -184,18 +182,18 @@ class MessageTest < ActiveSupport::TestCase assert_equal "text", message.body_format end -private + private def make_message(char, count) message = messages(:unread_message) message.title = char * count - return message + message end def assert_message_ok(char, count) message = make_message(char, count) assert message.save! response = message.class.find(message.id) # stand by for some über-generalisation... - assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length*count} bytes) fails" + assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length * count} bytes) fails" end end