Merge pull request #5019 from tomhughes/oauth2-cleanup

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 73ae5f76c8350d2b63da9a2ff0e8f75ba479ade6..1bc15cba3f30cc82aa9c9f014ce3de95bea7c593 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -4,26 +4,26 @@ class MessageTest < ActiveSupport::TestCase
   EURO = "\xe2\x82\xac".freeze # euro symbol
 
   def test_check_empty_message_fails
   EURO = "\xe2\x82\xac".freeze # euro symbol
 
   def test_check_empty_message_fails

-    message = Message.new
-    assert_not message.valid?
-    assert message.errors[:title].any?
-    assert message.errors[:body].any?
-    assert message.errors[:sent_on].any?
+    message = build(:message, :title => nil, :body => nil, :sent_on => nil)
+    assert_not_predicate message, :valid?
+    assert_predicate message.errors[:title], :any?
+    assert_predicate message.errors[:body], :any?
+    assert_predicate message.errors[:sent_on], :any?

     assert_not message.message_read
   end
 
   def test_validating_msgs
     message = create(:message, :unread)
     assert_not message.message_read
   end
 
   def test_validating_msgs
     message = create(:message, :unread)

-    assert message.valid?
+    assert_predicate message, :valid?

     message = create(:message, :read)
     message = create(:message, :read)

-    assert message.valid?
+    assert_predicate message, :valid?

   end
 
   def test_invalid_send_recipient
     message = create(:message, :unread)
     message.sender = nil
     message.recipient = nil
   end
 
   def test_invalid_send_recipient
     message = create(:message, :unread)
     message.sender = nil
     message.recipient = nil

-    assert_not message.valid?
+    assert_not_predicate message, :valid?

 
     assert_raise(ActiveRecord::RecordNotFound) { User.find(0) }
     message.from_user_id = 0
 
     assert_raise(ActiveRecord::RecordNotFound) { User.find(0) }
     message.from_user_id = 0


@@ -32,7 +32,7 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_utf8_roundtrip
   end
 
   def test_utf8_roundtrip

-    (1..255).each do |i|
+    [1, 255].each do |i|

       assert_message_ok("c", i)
       assert_message_ok(EURO, i)
     end
       assert_message_ok("c", i)
       assert_message_ok(EURO, i)
     end


@@ -51,7 +51,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
                          "\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, continuation and (incorrectly) plain ASCII

     invalid_sequences.each do |char|
       # create a message and save to the database
       msg = make_message(char, 1)
     invalid_sequences.each do |char|
       # create a message and save to the database
       msg = make_message(char, 1)


@@ -64,7 +64,7 @@ class MessageTest < ActiveSupport::TestCase
       db_msg = msg.class.find(msg.id)
       assert_equal char, db_msg.title, "Database silently truncated message title"
     rescue ArgumentError => e
       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"
+      assert_equal("invalid byte sequence in UTF-8", e.to_s)

     end
   end
 
     end
   end
 


@@ -75,7 +75,7 @@ class MessageTest < ActiveSupport::TestCase
       from "from@example.com"
       to "to@example.com"
       subject "Test message"
       from "from@example.com"
       to "to@example.com"
       subject "Test message"

-      date Time.now
+      date Time.now.utc

       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


@@ -95,7 +95,7 @@ class MessageTest < ActiveSupport::TestCase
       from "from@example.com"
       to "to@example.com"
       subject "Test message"
       from "from@example.com"
       to "to@example.com"
       subject "Test message"

-      date Time.now
+      date Time.now.utc

       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


@@ -115,7 +115,7 @@ class MessageTest < ActiveSupport::TestCase
       from "from@example.com"
       to "to@example.com"
       subject "Test message"
       from "from@example.com"
       to "to@example.com"
       subject "Test message"

-      date Time.now
+      date Time.now.utc

 
       text_part do
         content_type "text/plain; charset=utf-8"
 
       text_part do
         content_type "text/plain; charset=utf-8"


@@ -139,7 +139,7 @@ class MessageTest < ActiveSupport::TestCase
       from "from@example.com"
       to "to@example.com"
       subject "Test message"
       from "from@example.com"
       to "to@example.com"
       subject "Test message"

-      date Time.now
+      date Time.now.utc

 
       html_part do
         content_type "text/html; charset=utf-8"
 
       html_part do
         content_type "text/html; charset=utf-8"


@@ -162,7 +162,7 @@ class MessageTest < ActiveSupport::TestCase
       from "from@example.com"
       to "to@example.com"
       subject "[OpenStreetMap] Test message"
       from "from@example.com"
       to "to@example.com"
       subject "[OpenStreetMap] Test message"

-      date Time.now
+      date Time.now.utc

       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


@@ -175,6 +175,26 @@ class MessageTest < ActiveSupport::TestCase
     assert_equal "text", message.body_format
   end
 
     assert_equal "text", message.body_format
   end
 

+  def test_notify_recipient
+    message = create(:message)
+    assert_not_predicate message, :muted?
+    assert_predicate message, :notify_recipient?
+  end
+
+  def test_notify_recipient_for_muted_messages
+    message = create(:message, :muted)
+    assert_predicate message, :muted?
+    assert_not_predicate message, :notify_recipient?
+  end
+
+  def test_unmuting_a_muted_message
+    message = create(:message, :muted)
+    assert_predicate message, :muted?
+
+    message.unmute
+    assert_not_predicate message, :muted?
+  end
+

   private
 
   def make_message(char, count)
   private
 
   def make_message(char, count)