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

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 83cc1251d02d05a8465e802cb34727c029579cdb..1bc15cba3f30cc82aa9c9f014ce3de95bea7c593 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -5,7 +5,7 @@ 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_not_predicate message, :valid?

     assert_predicate message.errors[:title], :any?
     assert_predicate message.errors[:body], :any?
     assert_predicate message.errors[:sent_on], :any?
     assert_predicate message.errors[:title], :any?
     assert_predicate message.errors[:body], :any?
     assert_predicate message.errors[:sent_on], :any?


@@ -23,7 +23,7 @@ class MessageTest < ActiveSupport::TestCase
     message = create(:message, :unread)
     message.sender = nil
     message.recipient = nil
     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