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

[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 8215ce129f842956fe0bda591b95b3547394103e..991bf555dd8544fb79fe879a1f23e727533b0bc0 100644 (file)
--- a/test/models/changeset_comment_test.rb
+++ b/test/models/changeset_comment_test.rb
@@ -1,58 +1,56 @@
-# -*- coding: utf-8 -*-
 require "test_helper"
 
 class ChangesetCommentTest < ActiveSupport::TestCase
-  fixtures :changesets
-
   # validations
   def test_does_not_accept_invalid_author
     comment = create(:changeset_comment)
 
     comment.author = nil
-    assert !comment.valid?
+    assert_not_predicate comment, :valid?
 
     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
-    assert !comment.valid?
+    assert_not_predicate comment, :valid?
 
     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
-    assert !comment.valid?
+    assert_not_predicate comment, :valid?
   end
 
   def test_comments_of_changeset_count
-    create_list(:changeset_comment, 3, :changeset_id => changesets(:normal_user_closed_change).id)
-    assert_equal 3, Changeset.find(changesets(:normal_user_closed_change).id).comments.count
+    changeset = create(:changeset)
+    create_list(:changeset_comment, 3, :changeset_id => changeset.id)
+    assert_equal 3, Changeset.find(changeset.id).comments.count
   end
 
   def test_body_valid
-    ok = %W(Name vergrößern foo\nbar
-            ルシステムにも対応します 輕觸搖晃的遊戲)
+    ok = %W[Name vergrößern foo\nbar
+            ルシステムにも対応します 輕觸搖晃的遊戲]
     bad = ["foo\x00bar", "foo\x08bar", "foo\x1fbar", "foo\x7fbar",
            "foo\ufffebar", "foo\uffffbar"]
 
     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
-      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