X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..03cad948e30d8f82d0c1c5e249cd6c92bb44dd3d:/test/models/changeset_tag_test.rb

diff --git a/test/models/changeset_tag_test.rb b/test/models/changeset_tag_test.rb
index e62808b6e..0c5ffb151 100644
--- a/test/models/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -1,31 +1,29 @@
 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|
+    [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?
+      assert_predicate tag, :valid?
     end
   end
 
   def test_length_value_valid
+    changeset = create(:changeset)
+
     val = "v"
-    (0..255).each do |i|
+    [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?
+      assert_predicate tag, :valid?
     end
   end
 
@@ -35,8 +33,8 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = k
       tag.v = "v"
-      assert !tag.valid?, "Key #{k} should be too long"
-      assert tag.errors[:k].any?
+      assert_not tag.valid?, "Key #{k} should be too long"
+      assert_predicate tag.errors[:k], :any?
     end
   end
 
@@ -46,25 +44,26 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = "k"
       tag.v = v
-      assert !tag.valid?, "Value #{v} should be too long"
-      assert tag.errors[:v].any?
+      assert_not tag.valid?, "Value #{v} should be too long"
+      assert_predicate tag.errors[:v], :any?
     end
   end
 
   def test_empty_tag_invalid
     tag = ChangesetTag.new
-    assert !tag.valid?, "Empty tag should be invalid"
-    assert tag.errors[:changeset].any?
+    assert_not tag.valid?, "Empty tag should be invalid"
+    assert_predicate 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
-    assert tag.new_record?
-    assert !tag.valid?
+    tag.changeset_id = existing.changeset_id
+    tag.k = existing.k
+    tag.v = existing.v
+    assert_predicate tag, :new_record?
+    assert_not tag.valid?
     assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
-    assert tag.new_record?
+    assert_predicate tag, :new_record?
   end
 end