X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c53db246f606e0233a524e8f3c6390ea74e96890..cd3db7df4d111d04fe121e3d91b06007b8a98e31:/test/models/trace_test.rb

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 9f713924d..ed1dbc862 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 class TraceTest < ActiveSupport::TestCase
   api_fixtures
-  
+
   def setup
     @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR")
     Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces")
@@ -39,28 +39,30 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_validations
     trace_valid({})
-    trace_valid({:user_id => nil}, false)
-    trace_valid({:name => 'a'*255})
-    trace_valid({:name => 'a'*256}, false)
-    trace_valid({:description => nil}, false)
-    trace_valid({:description => 'a'*255})
-    trace_valid({:description => 'a'*256}, false)
-    trace_valid({:visibility => "private"})
-    trace_valid({:visibility => "public"})
-    trace_valid({:visibility => "trackable"})
-    trace_valid({:visibility => "identifiable"})
-    trace_valid({:visibility => "foo"}, false)
+    trace_valid({ :user_id => nil }, false)
+    trace_valid(:name => "a" * 255)
+    trace_valid({ :name => "a" * 256 }, false)
+    trace_valid({ :description => nil }, false)
+    trace_valid(:description => "a" * 255)
+    trace_valid({ :description => "a" * 256 }, false)
+    trace_valid(:visibility => "private")
+    trace_valid(:visibility => "public")
+    trace_valid(:visibility => "trackable")
+    trace_valid(:visibility => "identifiable")
+    trace_valid({ :visibility => "foo" }, false)
   end
 
   def test_tagstring
-    trace = Trace.new
+    trace = Trace.new(gpx_files(:public_trace_file).attributes)
     trace.tagstring = "foo bar baz"
+    assert trace.valid?
     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar", trace.tags[1].tag
     assert_equal "baz", trace.tags[2].tag
     assert_equal "foo, bar, baz", trace.tagstring
     trace.tagstring = "foo, bar baz ,qux"
+    assert trace.valid?
     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar baz", trace.tags[1].tag
@@ -106,7 +108,7 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal ".gpx.gz", gpx_files(:identifiable_trace_file).extension_name
   end
 
-private
+  private
 
   def check_query(query, traces)
     traces = traces.map { |t| gpx_files(t) }.sort