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

[rails.git] / test / models / changeset_comment_test.rb

diff --git a/test/models/changeset_comment_test.rb b/test/models/changeset_comment_test.rb
index 10901f70171f75381a6ea4959e21eaac433c0d87..5ef0c1d93ee9de6fca964fdc5e383fff0dd13a00 100644 (file)
--- a/test/models/changeset_comment_test.rb
+++ b/test/models/changeset_comment_test.rb
@@ -2,15 +2,11 @@
 require "test_helper"
 
 class ChangesetCommentTest < ActiveSupport::TestCase
-  fixtures :changesets, :changeset_comments
-
-  def test_changeset_comment_count
-    assert_equal 4, ChangesetComment.count
-  end
+  fixtures :changesets, :users
 
   # validations
   def test_does_not_accept_invalid_author
-    comment = changeset_comments(:normal_comment_1)
+    comment = create(:changeset_comment)
 
     comment.author = nil
     assert !comment.valid?
@@ -20,7 +16,7 @@ class ChangesetCommentTest < ActiveSupport::TestCase
   end
 
   def test_does_not_accept_invalid_changeset
-    comment = changeset_comments(:normal_comment_1)
+    comment = create(:changeset_comment)
 
     comment.changeset = nil
     assert !comment.valid?
@@ -30,14 +26,16 @@ class ChangesetCommentTest < ActiveSupport::TestCase
   end
 
   def test_does_not_accept_empty_visible
-    comment = changeset_comments(:normal_comment_1)
+    comment = create(:changeset_comment)
 
     comment.visible = nil
     assert !comment.valid?
   end
 
   def test_comments_of_changeset_count
-    assert_equal 3, Changeset.find(changesets(:normal_user_closed_change).id).comments.count
+    changeset = create(:changeset)
+    create_list(:changeset_comment, 3, :changeset_id => changeset.id)
+    assert_equal 3, Changeset.find(changeset.id).comments.count
   end
 
   def test_body_valid
@@ -47,13 +45,13 @@ class ChangesetCommentTest < ActiveSupport::TestCase
            "foo\ufffebar", "foo\uffffbar"]
 
     ok.each do |body|
-      changeset_comment = changeset_comments(:normal_comment_1)
+      changeset_comment = create(:changeset_comment)
       changeset_comment.body = body
       assert changeset_comment.valid?, "#{body} is invalid, when it should be"
     end
 
     bad.each do |body|
-      changeset_comment = changeset_comments(:normal_comment_1)
+      changeset_comment = create(:changeset_comment)
       changeset_comment.body = body
       assert !changeset_comment.valid?, "#{body} is valid when it shouldn't be"
     end