X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..e7ddfe10846f89b5eeec4bf4f4dc03057a744009:/test/models/note_comment_test.rb

diff --git a/test/models/note_comment_test.rb b/test/models/note_comment_test.rb
index 75707d79b..615586e56 100644
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -1,42 +1,39 @@
-# -*- coding: utf-8 -*-
-require 'test_helper'
+require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase
-  fixtures :users, :notes, :note_comments
-
   def test_event_valid
-    ok = [ "opened", "closed", "reopened", "commented", "hidden" ]
-    bad = [ "expropriated", "fubared" ]
+    ok = %w[opened closed reopened commented hidden]
+    bad = %w[expropriated fubared]
 
     ok.each do |event|
-      note_comment = note_comments(:t1)
+      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 = note_comments(:t1)
+      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
 
   def test_body_valid
-    ok = [ "Name", "vergrößern", "foo\x0abar",
-           "ルシステムにも対応します", "輕觸搖晃的遊戲", ]
-    bad = [ "foo\x00bar", "foo\x08bar", "foo\x1fbar", "foo\x7fbar",
-            "foo\ufffebar", "foo\uffffbar" ]
+    ok = %W[Name vergrößern foo\nbar
+            ルシステムにも対応します 輕觸搖晃的遊戲]
+    bad = ["foo\x00bar", "foo\x08bar", "foo\x1fbar", "foo\x7fbar",
+           "foo\ufffebar", "foo\uffffbar"]
 
     ok.each do |body|
-      note_comment = note_comments(:t1)
+      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 = note_comments(:t1)
+      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