X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..5c2cb9e96fdc00c7efd72ba4186308127e45855c:/test/models/way_tag_test.rb

diff --git a/test/models/way_tag_test.rb b/test/models/way_tag_test.rb
index 4d6116159..64aacc63b 100644
--- a/test/models/way_tag_test.rb
+++ b/test/models/way_tag_test.rb
@@ -1,70 +1,52 @@
-require 'test_helper'
+require "test_helper"
 
 class WayTagTest < ActiveSupport::TestCase
-  api_fixtures
-  
-  def test_way_tag_count
-    assert_equal 5, WayTag.count
-  end
-  
   def test_length_key_valid
-    key = "k"
-    (0..255).each do |i|
-      tag = WayTag.new
-      tag.way_id = current_way_tags(:t1).way_id
-      tag.k = key*i
-      tag.v = current_way_tags(:t1).v
-      assert tag.valid?
+    tag = create(:way_tag)
+    [0, 255].each do |i|
+      tag.k = "k" * i
+      assert_predicate tag, :valid?
     end
   end
-  
+
   def test_length_value_valid
-    val = "v"
-    (0..255).each do |i|
-      tag = WayTag.new
-      tag.way_id = current_way_tags(:t1).way_id
-      tag.k = "k"
-      tag.v = val*i
-      assert tag.valid?
+    tag = create(:way_tag)
+    [0, 255].each do |i|
+      tag.v = "v" * i
+      assert_predicate tag, :valid?
     end
   end
-  
+
   def test_length_key_invalid
-    ["k"*256].each do |i|
-      tag = WayTag.new
-      tag.way_id = current_way_tags(:t1).way_id
-      tag.k = i
-      tag.v = "v"
-      assert !tag.valid?, "Key #{i} should be too long"
-      assert tag.errors[:k].any?
-    end
+    tag = create(:way_tag)
+    tag.k = "k" * 256
+    assert_not tag.valid?, "Key should be too long"
+    assert_predicate tag.errors[:k], :any?
   end
-  
+
   def test_length_value_invalid
-    ["v"*256].each do |i|
-      tag = WayTag.new
-      tag.way_id = current_way_tags(:t1).way_id
-      tag.k = "k"
-      tag.v = i
-      assert !tag.valid?, "Value #{i} should be too long"
-      assert tag.errors[:v].any?
-    end
+    tag = create(:way_tag)
+    tag.v = "v" * 256
+    assert_not tag.valid?, "Value should be too long"
+    assert_predicate tag.errors[:v], :any?
   end
-  
-  def test_empty_tag_invalid
-    tag = WayTag.new
-    assert !tag.valid?, "Empty way tag should be invalid"
-    assert tag.errors[:way].any?
+
+  def test_orphaned_tag_invalid
+    tag = create(:way_tag)
+    tag.way = nil
+    assert_not tag.valid?, "Orphaned tag should be invalid"
+    assert_predicate tag.errors[:way], :any?
   end
-  
+
   def test_uniqueness
-    tag = WayTag.new
-    tag.way_id = current_way_tags(:t1).way_id
-    tag.k = current_way_tags(:t1).k
-    tag.v = current_way_tags(:t1).v
-    assert tag.new_record?
-    assert !tag.valid?
-    assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
-    assert tag.new_record?
+    existing = create(:way_tag)
+    tag = build(:way_tag, :way => existing.way, :k => existing.k, :v => existing.v)
+    tag.way_id = existing.way_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_predicate tag, :new_record?
   end
 end