X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fd6f00b069af5a7b87227ea4c3401dc461d7311a..c798fe416a60eb25f8390ca8a5ab22126dfc7155:/test/unit/message_test.rb?ds=sidebyside

diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb
index a732aa586..3da91de38 100644
--- a/test/unit/message_test.rb
+++ b/test/unit/message_test.rb
@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 
-class MessageTest < Test::Unit::TestCase
+class MessageTest < ActiveSupport::TestCase
   api_fixtures
   fixtures :messages
 
@@ -15,21 +16,21 @@ class MessageTest < Test::Unit::TestCase
   def test_check_empty_message_fails
     message = Message.new
     assert !message.valid?
-    assert message.errors.invalid?(:title)
-    assert message.errors.invalid?(:body)
-    assert message.errors.invalid?(:sent_on)
-    assert true, message.message_read
+    assert message.errors[:title].any?
+    assert message.errors[:body].any?
+    assert message.errors[:sent_on].any?
+    assert !message.message_read
   end
   
   def test_validating_msgs
-    message = messages(:one)
+    message = messages(:unread_message)
     assert message.valid?
-    massage = messages(:two)
+    massage = messages(:read_message)
     assert message.valid?
   end
   
   def test_invalid_send_recipient
-    message = messages(:one)
+    message = messages(:unread_message)
     message.sender = nil
     message.recipient = nil
     assert !message.valid?
@@ -75,14 +76,118 @@ class MessageTest < Test::Unit::TestCase
         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"
+
       rescue ActiveRecord::RecordInvalid
         # because we only test invalid sequences it is OK to barf on them
       end
     end
   end  
 
+  def test_from_mail_plain
+    mail = Mail.new do
+      from "from@example.com"
+      to "to@example.com"
+      subject "Test message"
+      date Time.now
+      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
+    assert_equal mail.date, message.sent_on
+    assert_equal "Test message", message.title
+    assert_equal "This is a test & a message", message.body
+    assert_equal "text", message.body_format
+  end
+
+  def test_from_mail_html
+    mail = Mail.new do
+      from "from@example.com"
+      to "to@example.com"
+      subject "Test message"
+      date Time.now
+      content_type 'text/html; charset=utf-8'
+      body "<p>This is a <b>test</b> &amp; a message</p>"
+    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
+    assert_equal mail.date, message.sent_on
+    assert_equal "Test message", message.title
+    assert_match /^ *This is a test & a message *$/, message.body
+    assert_equal "text", message.body_format
+  end
+
+  def test_from_mail_multipart
+    mail = Mail.new do
+      from "from@example.com"
+      to "to@example.com"
+      subject "Test message"
+      date Time.now
+
+      text_part do
+        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'
+        body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
+      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
+    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
+    assert_equal "text", message.body_format
+
+    mail = Mail.new do
+      from "from@example.com"
+      to "to@example.com"
+      subject "Test message"
+      date Time.now
+
+      html_part do
+        content_type 'text/html; charset=utf-8'
+        body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
+      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
+    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_equal "text", message.body_format
+  end
+
+  def test_from_mail_prefix
+    mail = Mail.new do
+      from "from@example.com"
+      to "to@example.com"
+      subject "[OpenStreetMap] Test message"
+      date Time.now
+      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
+    assert_equal mail.date, message.sent_on
+    assert_equal "Test message", message.title
+    assert_equal "This is a test & a message", message.body
+    assert_equal "text", message.body_format
+  end
+
+private
+
   def make_message(char, count)
-    message = messages(:one)
+    message = messages(:unread_message)
     message.title = char * count
     return message
   end
@@ -93,5 +198,4 @@ class MessageTest < Test::Unit::TestCase
     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"
   end
-
 end