X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f381ff6fb2411c0edf0aa709860a26c72b6c9d18..f8f7ab15685403a2b440723f83fdd8451488c908:/test/models/message_test.rb diff --git a/test/models/message_test.rb b/test/models/message_test.rb index e2d87136e..18b75f451 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -1,18 +1,15 @@ -# -*- coding: utf-8 -*- require "test_helper" class MessageTest < ActiveSupport::TestCase - api_fixtures - EURO = "\xe2\x82\xac".freeze # euro symbol def test_check_empty_message_fails message = Message.new - assert !message.valid? + assert_not message.valid? assert message.errors[:title].any? assert message.errors[:body].any? assert message.errors[:sent_on].any? - assert !message.message_read + assert_not message.message_read end def test_validating_msgs @@ -26,7 +23,7 @@ class MessageTest < ActiveSupport::TestCase 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 @@ -67,10 +64,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" - end end end @@ -111,7 +106,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 @@ -158,7 +153,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