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

[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 323a827c042678d9ca961b87624a4e66de06ec63..2375ba9d4de2f08c0799be9785a35b41eae2c86d 100644 (file)
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -2,20 +2,20 @@
 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase
 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase

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

 
   def test_event_valid
     ok = %w(opened closed reopened commented hidden)
     bad = %w(expropriated fubared)
 
     ok.each do |event|
 
   def test_event_valid
     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"
     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
       note_comment.event = event
       assert !note_comment.valid?, "#{event} is valid when it shouldn't be"
     end


@@ -28,13 +28,13 @@ class NoteCommentTest < ActiveSupport::TestCase
            "foo\ufffebar", "foo\uffffbar"]
 
     ok.each do |body|
            "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"
     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