X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..6db326aa1f084a062a3b658876bc01bf650f5702:/test/models/message_test.rb?ds=sidebyside

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index a6ae3ecce..60ff19e44 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_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
-    message = messages(:unread_message)
+    message = create(:message, :unread)
     assert message.valid?
-    message = 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?
+    assert_not message.valid?
 
     assert_raise(ActiveRecord::RecordNotFound) { User.find(0) }
     message.from_user_id = 0
@@ -61,29 +51,26 @@ 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, 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!
-
-        # 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 e.to_s, "invalid byte sequence in UTF-8"
     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"
@@ -92,9 +79,9 @@ class MessageTest < ActiveSupport::TestCase
       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,6 +89,8 @@ 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"
@@ -110,16 +99,18 @@ class MessageTest < ActiveSupport::TestCase
       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
+    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"
@@ -136,9 +127,9 @@ class MessageTest < ActiveSupport::TestCase
         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
@@ -155,16 +146,18 @@ class MessageTest < ActiveSupport::TestCase
         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_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"
@@ -173,9 +166,9 @@ class MessageTest < ActiveSupport::TestCase
       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