X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/98184dfb9cacc74ac5bcb91a41a2d5804b3f4f7d..9badc45929af8a187a36bddfc965c32135dbb16b:/test/models/relation_tag_test.rb

diff --git a/test/models/relation_tag_test.rb b/test/models/relation_tag_test.rb
index 0b5bedb05..f221f78cc 100644
--- a/test/models/relation_tag_test.rb
+++ b/test/models/relation_tag_test.rb
@@ -1,81 +1,64 @@
-require 'test_helper'
+require "test_helper"
 
 class RelationTagTest < ActiveSupport::TestCase
   api_fixtures
-  
-  def test_relation_tag_count
-    assert_equal 9, RelationTag.count
-  end
-  
+
   def test_length_key_valid
-    key = "k"
+    tag = create(:relation_tag)
     (0..255).each do |i|
-      tag = RelationTag.new
-      tag.relation_id = 1
-      tag.k = key*i
-      tag.v = "v"
+      tag.k = "k" * i
       assert tag.valid?
     end
   end
-  
+
   def test_length_value_valid
-    val = "v"
+    tag = create(:relation_tag)
     (0..255).each do |i|
-      tag = RelationTag.new
-      tag.relation_id = 1
-      tag.k = "k"
-      tag.v = val*i
+      tag.v = "v" * i
       assert tag.valid?
     end
   end
-  
+
   def test_length_key_invalid
-    ["k"*256].each do |i|
-      tag = RelationTag.new
-      tag.relation_id = 1
-      tag.k = i
-      tag.v = "v"
-      assert !tag.valid?, "Key #{i} should be too long"
-      assert tag.errors[:k].any?
-    end
+    tag = create(:relation_tag)
+    tag.k = "k" * 256
+    assert !tag.valid?, "Key should be too long"
+    assert tag.errors[:k].any?
   end
-  
+
   def test_length_value_invalid
-    ["v"*256].each do |i|
-      tag = RelationTag.new
-      tag.relation_id = 1
-      tag.k = "k"
-      tag.v = i
-      assert !tag.valid?, "Value #{i} should be too long"
-      assert tag.errors[:v].any?
-    end
+    tag = create(:relation_tag)
+    tag.v = "v" * 256
+    assert !tag.valid?, "Value should be too long"
+    assert tag.errors[:v].any?
   end
-  
+
   def test_empty_tag_invalid
     tag = RelationTag.new
     assert !tag.valid?, "Empty relation tag should be invalid"
     assert tag.errors[:relation].any?
   end
-  
+
   def test_uniquness
+    existing = create(:relation_tag)
     tag = RelationTag.new
-    tag.relation_id = current_relation_tags(:t1).relation_id
-    tag.k = current_relation_tags(:t1).k
-    tag.v = current_relation_tags(:t1).v
+    tag.relation_id = existing.relation_id
+    tag.k = existing.k
+    tag.v = existing.v
     assert tag.new_record?
     assert !tag.valid?
-    assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
+    assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
     assert tag.new_record?
   end
 
   ##
   # test that tags can be updated and saved uniquely, i.e: tag.save!
-  # only affects the single tag that the activerecord object 
+  # only affects the single tag that the activerecord object
   # represents. this amounts to testing that the primary key is
   # unique.
   #
   # Commenting this out - I attempted to fix it, but composite primary keys
-  # wasn't playing nice with the column already called :id. Seemed to be 
+  # wasn't playing nice with the column already called :id. Seemed to be
   # impossible to have validations on the :id column. If someone knows better
   # please fix, otherwise this test is shelved.
   #