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

[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 e61732904e38fb9edad78cd250bee5b7750b404b..615586e56a7ede40221ace2997df96f409409254 100644 (file)
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -1,42 +1,39 @@
-# -*- coding: utf-8 -*-

 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase
 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase

-  fixtures :users, :notes, :note_comments
-

   def test_event_valid
   def test_event_valid

-    ok = %w(opened closed reopened commented hidden)
-    bad = %w(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
       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|
     end
 
     bad.each do |event|

-      note_comment = note_comments(:t1)
+      note_comment = create(:note_comment)

       note_comment.event = event
       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
     end
   end
 
   def test_body_valid

-    ok = ["Name", "vergrößern", "foo\x0abar",
-          "ルシステムにも対応します", "輕觸搖晃的遊戲"]
+    ok = %W[Name vergrößern foo\nbar
+            ルシステムにも対応します 輕觸搖晃的遊戲]

     bad = ["foo\x00bar", "foo\x08bar", "foo\x1fbar", "foo\x7fbar",
            "foo\ufffebar", "foo\uffffbar"]
 
     ok.each do |body|
     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
       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|
     end
 
     bad.each do |body|

-      note_comment = note_comments(:t1)
+      note_comment = create(:note_comment)

       note_comment.body = body
       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
     end
   end
 end