Merge remote-tracking branch 'openstreetmap/pull/1483'

[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 75707d79b811837d08cbb582b890fa784fb4eb9c..2375ba9d4de2f08c0799be9785a35b41eae2c86d 100644 (file)
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -1,40 +1,40 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-require 'test_helper'
+require "test_helper"

 
 class NoteCommentTest < ActiveSupport::TestCase
 
 class NoteCommentTest < ActiveSupport::TestCase

-  fixtures :users, :notes, :note_comments
+  fixtures :users

 
   def test_event_valid
 
   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|
 
     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"
     end
 
     bad.each do |event|
       note_comment.event = event
       assert 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"
     end
   end
 
   def test_body_valid
       note_comment.event = event
       assert !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|
 
     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"
     end
 
     bad.each do |body|
       note_comment.body = body
       assert 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"
     end
       note_comment.body = body
       assert !note_comment.valid?, "#{body} is valid when it shouldn't be"
     end