X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..4b43396ede248f97560b059ef202c7fa26d63947:/test/models/message_test.rb
diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 079e10c42..4f8c4b8e2 100644
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -1,17 +1,10 @@
# -*- coding: utf-8 -*-
-require 'test_helper'
+require "test_helper"
class MessageTest < ActiveSupport::TestCase
api_fixtures
- fixtures :messages
- EURO = "\xe2\x82\xac" #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
+ EURO = "\xe2\x82\xac".freeze # euro symbol
def test_check_empty_message_fails
message = Message.new
@@ -21,16 +14,16 @@ class MessageTest < ActiveSupport::TestCase
assert message.errors[:sent_on].any?
assert !message.message_read
end
-
+
def test_validating_msgs
- message = messages(:unread_message)
+ message = create(:message, :unread)
assert message.valid?
- massage = messages(:read_message)
+ message = create(:message, :read)
assert 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?
@@ -38,40 +31,39 @@ 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
"\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, 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!
+ 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 +71,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 +81,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 +99,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 +119,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 +143,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 +162,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 +174,18 @@ class MessageTest < ActiveSupport::TestCase
assert_equal "text", message.body_format
end
-private
+ private
def make_message(char, count)
- message = messages(:unread_message)
+ message = build(:message, :unread)
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