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

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 4f8c4b8e2ca2d06e7ea492b4c247f0b0766751ba..e2d87136e7ee419478ab2a5c4eb4dbb0db7783b1 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -76,6 +76,8 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_from_mail_plain
   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"
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"


@@ -84,9 +86,9 @@ class MessageTest < ActiveSupport::TestCase
       content_type "text/plain; charset=utf-8"
       body "This is a test & a message"
     end
       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
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_equal "This is a test & a message", message.body


@@ -94,6 +96,8 @@ 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"
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"


@@ -102,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
       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_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_match /^ *This is a test & a message *$/, message.body


@@ -112,6 +116,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"


@@ -128,9 +134,9 @@ class MessageTest < ActiveSupport::TestCase
         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


@@ -147,9 +153,9 @@ class MessageTest < ActiveSupport::TestCase
         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


@@ -157,6 +163,8 @@ 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"
     mail = Mail.new do
       from "from@example.com"
       to "to@example.com"


@@ -165,9 +173,9 @@ class MessageTest < ActiveSupport::TestCase
       content_type "text/plain; charset=utf-8"
       body "This is a test & a message"
     end
       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
     assert_equal mail.date, message.sent_on
     assert_equal "Test message", message.title
     assert_equal "This is a test & a message", message.body