X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..5e407dfb34f47e6fbbbf3c11c1a8318256abb5cd:/test/models/changeset_tag_test.rb

diff --git a/test/models/changeset_tag_test.rb b/test/models/changeset_tag_test.rb
index 75bbba0ba..1db2effd6 100644
--- a/test/models/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -1,17 +1,13 @@
-require 'test_helper'
+require "test_helper"
 
 class ChangesetTagTest < ActiveSupport::TestCase
-  api_fixtures
-
-  def test_changeset_tag_count
-    assert_equal 2, ChangesetTag.count
-  end
-
   def test_length_key_valid
+    changeset = create(:changeset)
+
     key = "k"
     (0..255).each do |i|
       tag = ChangesetTag.new
-      tag.changeset_id = 1
+      tag.changeset_id = changeset.id
       tag.k = key * i
       tag.v = "v"
       assert tag.valid?
@@ -19,10 +15,12 @@ class ChangesetTagTest < ActiveSupport::TestCase
   end
 
   def test_length_value_valid
+    changeset = create(:changeset)
+
     val = "v"
     (0..255).each do |i|
       tag = ChangesetTag.new
-      tag.changeset_id = 1
+      tag.changeset_id = changeset.id
       tag.k = "k"
       tag.v = val * i
       assert tag.valid?
@@ -35,7 +33,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = k
       tag.v = "v"
-      assert !tag.valid?, "Key #{k} should be too long"
+      assert_not tag.valid?, "Key #{k} should be too long"
       assert tag.errors[:k].any?
     end
   end
@@ -46,24 +44,25 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = "k"
       tag.v = v
-      assert !tag.valid?, "Value #{v} should be too long"
+      assert_not tag.valid?, "Value #{v} should be too long"
       assert tag.errors[:v].any?
     end
   end
 
   def test_empty_tag_invalid
     tag = ChangesetTag.new
-    assert !tag.valid?, "Empty tag should be invalid"
+    assert_not tag.valid?, "Empty tag should be invalid"
     assert tag.errors[:changeset].any?
   end
 
   def test_uniqueness
+    existing = create(:changeset_tag)
     tag = ChangesetTag.new
-    tag.changeset_id = changeset_tags(:changeset_1_tag_1).changeset_id
-    tag.k = changeset_tags(:changeset_1_tag_1).k
-    tag.v = changeset_tags(:changeset_1_tag_1).v
+    tag.changeset_id = existing.changeset_id
+    tag.k = existing.k
+    tag.v = existing.v
     assert tag.new_record?
-    assert !tag.valid?
+    assert_not tag.valid?
     assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
     assert tag.new_record?
   end