Merge remote-tracking branch 'openstreetmap/pull/1483'

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index a6ae3ecce3b0f9e02b0a30ba128624ff2de85ffb..e2d87136e7ee419478ab2a5c4eb4dbb0db7783b1 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -3,16 +3,9 @@ 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?
@@ -23,14 +16,14 @@ class MessageTest < ActiveSupport::TestCase
   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?
@@ -61,8 +54,7 @@ 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
@@ -84,6 +76,8 @@ class MessageTest < ActiveSupport::TestCase
   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 +86,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 +96,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,9 +106,9 @@ 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
@@ -120,6 +116,8 @@ class MessageTest < ActiveSupport::TestCase
   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 +134,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,9 +153,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_match /^ *This is a test & a message in HTML format *$/, message.body
@@ -165,6 +163,8 @@ class MessageTest < ActiveSupport::TestCase
   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 +173,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 +185,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