Merge remote-tracking branch 'upstream/pull/2994'

[rails.git] / test / models / tracetag_test.rb

diff --git a/test/models/tracetag_test.rb b/test/models/tracetag_test.rb
index d5849e37f854d2f25e3878804682967f9c36c814..1aaa596d2d5412aa2cd7131ca1a1731cf24c03e0 100644 (file)
--- 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
+  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