X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..212fe75b6fd26d01dfacf31650e7f71eb7f06a63:/test/models/tracetag_test.rb

diff --git a/test/models/tracetag_test.rb b/test/models/tracetag_test.rb
index 0ad8cae2f..0d2b17953 100644
--- a/test/models/tracetag_test.rb
+++ b/test/models/tracetag_test.rb
@@ -1,31 +1,25 @@
-require 'test_helper'
+require "test_helper"
 
 class TracetagTest < ActiveSupport::TestCase
-  api_fixtures
-
-  def test_tracetag_count
-    assert_equal 4, Tracetag.count
-  end
-
   def test_validations
     tracetag_valid({})
-    tracetag_valid({ :tag => nil }, false)
-    tracetag_valid({ :tag => '' }, false)
-    tracetag_valid(:tag => 'a')
-    tracetag_valid(:tag => 'a' * 255)
-    tracetag_valid({ :tag => 'a' * 256 }, false)
-    tracetag_valid({ :tag => 'a/b' }, false)
-    tracetag_valid({ :tag => 'a;b' }, false)
-    tracetag_valid({ :tag => 'a.b' }, false)
-    tracetag_valid({ :tag => 'a,b' }, false)
-    tracetag_valid({ :tag => 'a?b' }, false)
+    tracetag_valid({ :tag => nil }, :valid => false)
+    tracetag_valid({ :tag => "" }, :valid => false)
+    tracetag_valid({ :tag => "a" })
+    tracetag_valid({ :tag => "a" * 255 })
+    tracetag_valid({ :tag => "a" * 256 }, :valid => false)
+    tracetag_valid({ :tag => "a/b" }, :valid => false)
+    tracetag_valid({ :tag => "a;b" }, :valid => false)
+    tracetag_valid({ :tag => "a.b" }, :valid => false)
+    tracetag_valid({ :tag => "a,b" }, :valid => false)
+    tracetag_valid({ :tag => "a?b" }, :valid => false)
   end
 
   private
 
-  def tracetag_valid(attrs, result = true)
-    entry = Tracetag.new(gpx_file_tags(:first_trace_1).attributes)
+  def tracetag_valid(attrs, valid: true)
+    entry = build(:tracetag)
     entry.assign_attributes(attrs)
-    assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}"
+    assert_equal valid, entry.valid?, "Expected #{attrs.inspect} to be #{valid}"
   end
 end