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

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

diff --git a/test/models/changeset_comment_test.rb b/test/models/changeset_comment_test.rb
index 8e8d0cd70b7646378b0bf3b37e54c172058264fc..991bf555dd8544fb79fe879a1f23e727533b0bc0 100644 (file)
--- a/test/models/changeset_comment_test.rb
+++ b/test/models/changeset_comment_test.rb
@@ -6,27 +6,27 @@ class ChangesetCommentTest < ActiveSupport::TestCase
     comment = create(:changeset_comment)
 
     comment.author = nil
     comment = create(:changeset_comment)
 
     comment.author = nil

-    assert !comment.valid?
+    assert_not_predicate comment, :valid?

 
     comment.author_id = 999111
 
     comment.author_id = 999111

-    assert !comment.valid?
+    assert_not_predicate comment, :valid?

   end
 
   def test_does_not_accept_invalid_changeset
     comment = create(:changeset_comment)
 
     comment.changeset = nil
   end
 
   def test_does_not_accept_invalid_changeset
     comment = create(:changeset_comment)
 
     comment.changeset = nil

-    assert !comment.valid?
+    assert_not_predicate comment, :valid?

 
     comment.changeset_id = 999111
 
     comment.changeset_id = 999111

-    assert !comment.valid?
+    assert_not_predicate comment, :valid?

   end
 
   def test_does_not_accept_empty_visible
     comment = create(:changeset_comment)
 
     comment.visible = nil
   end
 
   def test_does_not_accept_empty_visible
     comment = create(:changeset_comment)
 
     comment.visible = nil

-    assert !comment.valid?
+    assert_not_predicate comment, :valid?

   end
 
   def test_comments_of_changeset_count
   end
 
   def test_comments_of_changeset_count


@@ -44,13 +44,13 @@ class ChangesetCommentTest < ActiveSupport::TestCase
     ok.each do |body|
       changeset_comment = create(:changeset_comment)
       changeset_comment.body = body
     ok.each do |body|
       changeset_comment = create(:changeset_comment)
       changeset_comment.body = body

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

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

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

     end
   end
 end
     end
   end
 end