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

[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 6bda0ee7d363fb3cf7c74241399b376c36e5eb53..615586e56a7ede40221ace2997df96f409409254 100644 (file)
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase
 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase


@@ -9,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_predicate note_comment, :valid?, "#{event} is valid when it shouldn't be"

     end
   end
 
     end
   end
 


@@ -28,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_predicate note_comment, :valid?, "#{body} is valid when it shouldn't be"

     end
   end
 end
     end
   end
 end