X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/945ff7911ca51dc250ffaba71f62821b5c0c0a95..68fa607811e681535cc3db03d3a57a4654dd8292:/test/models/message_test.rb?ds=sidebyside diff --git a/test/models/message_test.rb b/test/models/message_test.rb index a6ae3ecce..97afad56e 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -1,39 +1,29 @@ -# -*- coding: utf-8 -*- require "test_helper" class MessageTest < ActiveSupport::TestCase - api_fixtures - fixtures :messages - EURO = "\xe2\x82\xac".freeze # euro symbol - # This needs to be updated when new fixtures are added - # or removed. - def test_check_message_count - assert_equal 2, Message.count - end - def test_check_empty_message_fails - message = Message.new - assert !message.valid? - assert message.errors[:title].any? - assert message.errors[:body].any? - assert message.errors[:sent_on].any? - assert !message.message_read + message = build(:message, :title => nil, :body => nil, :sent_on => nil) + assert_not message.valid? + assert_predicate message.errors[:title], :any? + assert_predicate message.errors[:body], :any? + assert_predicate message.errors[:sent_on], :any? + assert_not message.message_read end def test_validating_msgs - message = messages(:unread_message) - assert message.valid? - message = messages(:read_message) - assert message.valid? + message = create(:message, :unread) + assert_predicate message, :valid? + message = create(:message, :read) + assert_predicate message, :valid? end def test_invalid_send_recipient - message = messages(:unread_message) + message = create(:message, :unread) message.sender = nil message.recipient = nil - assert !message.valid? + assert_not message.valid? assert_raise(ActiveRecord::RecordNotFound) { User.find(0) } message.from_user_id = 0 @@ -42,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 @@ -61,40 +51,37 @@ 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| - 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("invalid byte sequence in UTF-8", e.to_s) end end def test_from_mail_plain + sender_user = create(:user) + recipient_user = create(:user) mail = Mail.new do from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc 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)) - assert_equal users(:normal_user), message.sender - assert_equal users(:public_user), message.recipient + message = Message.from_mail(mail, sender_user, recipient_user) + assert_equal sender_user, message.sender + assert_equal recipient_user, message.recipient assert_equal mail.date, message.sent_on assert_equal "Test message", message.title assert_equal "This is a test & a message", message.body @@ -102,29 +89,33 @@ class MessageTest < ActiveSupport::TestCase end def test_from_mail_html + sender_user = create(:user) + recipient_user = create(:user) mail = Mail.new do from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc 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)) - assert_equal users(:normal_user), message.sender - assert_equal users(:public_user), message.recipient + message = Message.from_mail(mail, sender_user, recipient_user) + assert_equal sender_user, message.sender + 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 def test_from_mail_multipart + sender_user = create(:user) + recipient_user = create(:user) mail = Mail.new do from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc text_part do content_type "text/plain; charset=utf-8" @@ -136,9 +127,9 @@ class MessageTest < ActiveSupport::TestCase body "This is a test & a message in HTML format
" end end - message = Message.from_mail(mail, users(:normal_user), users(:public_user)) - assert_equal users(:normal_user), message.sender - assert_equal users(:public_user), message.recipient + message = Message.from_mail(mail, sender_user, recipient_user) + assert_equal sender_user, message.sender + assert_equal recipient_user, message.recipient assert_equal mail.date, message.sent_on assert_equal "Test message", message.title assert_equal "This is a test & a message in text format", message.body @@ -148,34 +139,36 @@ class MessageTest < ActiveSupport::TestCase from "from@example.com" to "to@example.com" subject "Test message" - date Time.now + date Time.now.utc html_part do content_type "text/html; charset=utf-8" body "This is a test & a message in HTML format
" end end - message = Message.from_mail(mail, users(:normal_user), users(:public_user)) - assert_equal users(:normal_user), message.sender - assert_equal users(:public_user), message.recipient + message = Message.from_mail(mail, sender_user, recipient_user) + assert_equal sender_user, message.sender + 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 def test_from_mail_prefix + sender_user = create(:user) + recipient_user = create(:user) mail = Mail.new do from "from@example.com" to "to@example.com" subject "[OpenStreetMap] Test message" - date Time.now + date Time.now.utc 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)) - assert_equal users(:normal_user), message.sender - assert_equal users(:public_user), message.recipient + message = Message.from_mail(mail, sender_user, recipient_user) + assert_equal sender_user, message.sender + assert_equal recipient_user, message.recipient assert_equal mail.date, message.sent_on assert_equal "Test message", message.title assert_equal "This is a test & a message", message.body @@ -185,7 +178,7 @@ class MessageTest < ActiveSupport::TestCase private def make_message(char, count) - message = messages(:unread_message) + message = build(:message, :unread) message.title = char * count message end @@ -193,7 +186,7 @@ class MessageTest < ActiveSupport::TestCase 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... + response = message.class.find(message.id) # stand by for some uber-generalisation... assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length * count} bytes) fails" end end