X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/86822ea225baf400c7978b0d459b821dbe17e293..f50ca826aad559c77f948ccca61cbdc0bbddf3d1:/test/models/changeset_comment_test.rb diff --git a/test/models/changeset_comment_test.rb b/test/models/changeset_comment_test.rb index 0999ea505..991bf555d 100644 --- a/test/models/changeset_comment_test.rb +++ b/test/models/changeset_comment_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class ChangesetCommentTest < ActiveSupport::TestCase @@ -7,27 +6,27 @@ class ChangesetCommentTest < ActiveSupport::TestCase 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 @@ -37,21 +36,21 @@ class ChangesetCommentTest < ActiveSupport::TestCase 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