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

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

diff --git a/test/models/note_comment_test.rb b/test/models/note_comment_test.rb
index 21d67dc678718afd4171de3be2985664e556084c..f4dd645ee21a9392d8e13f6f557e6142aac07e9e 100644 (file)
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -8,13 +8,13 @@ class NoteCommentTest < ActiveSupport::TestCase
     ok.each do |event|
       note_comment = create(:note_comment)
       note_comment.event = event
     ok.each do |event|
       note_comment = create(:note_comment)
       note_comment.event = event

-      assert note_comment.valid?, "#{event} is invalid, when it should be"
+      assert_predicate note_comment, :valid?, "#{event} is invalid, when it should be"

     end
 
     bad.each do |event|
       note_comment = create(:note_comment)
       note_comment.event = event
     end
 
     bad.each do |event|
       note_comment = create(:note_comment)
       note_comment.event = event

-      assert !note_comment.valid?, "#{event} is valid when it shouldn't be"
+      assert_not note_comment.valid?, "#{event} is valid when it shouldn't be"

     end
   end
 
     end
   end
 


@@ -27,13 +27,13 @@ class NoteCommentTest < ActiveSupport::TestCase
     ok.each do |body|
       note_comment = create(:note_comment)
       note_comment.body = body
     ok.each do |body|
       note_comment = create(:note_comment)
       note_comment.body = body

-      assert note_comment.valid?, "#{body} is invalid, when it should be"
+      assert_predicate note_comment, :valid?, "#{body} is invalid, when it should be"

     end
 
     bad.each do |body|
       note_comment = create(:note_comment)
       note_comment.body = body
     end
 
     bad.each do |body|
       note_comment = create(:note_comment)
       note_comment.body = body

-      assert !note_comment.valid?, "#{body} is valid when it shouldn't be"
+      assert_not note_comment.valid?, "#{body} is valid when it shouldn't be"

     end
   end
 end
     end
   end
 end