Merge remote-tracking branch 'upstream/pull/5135'

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 1a12410916775e2ed67cb1ff67069c0f68161b18..1bc15cba3f30cc82aa9c9f014ce3de95bea7c593 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -5,25 +5,25 @@ class MessageTest < ActiveSupport::TestCase
 
   def test_check_empty_message_fails
     message = build(:message, :title => nil, :body => nil, :sent_on => nil)
 
   def test_check_empty_message_fails
     message = build(:message, :title => nil, :body => nil, :sent_on => nil)

-    assert_not message.valid?
-    assert message.errors[:title].any?
-    assert message.errors[:body].any?
-    assert message.errors[:sent_on].any?
+    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


@@ -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)