Update to iD v2.6.0

[rails.git] / test / models / message_test.rb

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 5cd1712110acfadd3ff1f5e9786163cfb0771586..285222f1e576217098f2861854015a87635f5ced 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -1,17 +1,7 @@
-# -*- coding: utf-8 -*-
-require 'test_helper'
+require "test_helper"

 
 class MessageTest < ActiveSupport::TestCase
 
 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
 
   def test_check_empty_message_fails
     message = Message.new


@@ -23,14 +13,14 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_validating_msgs
   end
 
   def test_validating_msgs

-    message = messages(:unread_message)
+    message = create(:message, :unread)

     assert message.valid?
     assert message.valid?

-    message = messages(:read_message)
+    message = create(:message, :read)

     assert message.valid?
   end
 
   def test_invalid_send_recipient
     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?
     message.sender = nil
     message.recipient = nil
     assert !message.valid?


@@ -43,26 +33,25 @@ class MessageTest < ActiveSupport::TestCase
 
   def test_utf8_roundtrip
     (1..255).each do |i|
 
   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_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
     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
     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
     invalid_sequences.each do |char|
       begin
         # create a message and save to the database


@@ -75,26 +64,26 @@ 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"
         # 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"
       rescue ArgumentError => ex
         assert_equal ex.to_s, "invalid byte sequence in UTF-8"

-

       end
     end
   end
 
   def test_from_mail_plain
       end
     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
     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'
+      content_type "text/plain; charset=utf-8"

       body "This is a test & a message"
     end
       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
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_equal "This is a test & a message", message.body


@@ -102,17 +91,19 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_html
   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
     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'
+      content_type "text/html; charset=utf-8"

       body "<p>This is a <b>test</b> &amp; a message</p>"
     end
       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
+    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_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_match /^ *This is a test & a message *$/, message.body


@@ -120,6 +111,8 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_multipart
   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"
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"


@@ -127,18 +120,18 @@ class MessageTest < ActiveSupport::TestCase
       date Time.now
 
       text_part do
       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
         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 "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
       end
     end
         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
+    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
     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


@@ -151,13 +144,13 @@ class MessageTest < ActiveSupport::TestCase
       date Time.now
 
       html_part do
       date Time.now
 
       html_part do

-        content_type 'text/html; charset=utf-8'
+        content_type "text/html; charset=utf-8"

         body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
       end
     end
         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
+    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_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


@@ -165,17 +158,19 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_prefix
   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
     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'
+      content_type "text/plain; charset=utf-8"

       body "This is a test & a message"
     end
       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
     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 +180,7 @@ class MessageTest < ActiveSupport::TestCase
   private
 
   def make_message(char, count)
   private
 
   def make_message(char, count)

-    message = messages(:unread_message)
+    message = build(:message, :unread)

     message.title = char * count
     message
   end
     message.title = char * count
     message
   end