Fix validation failures for trace tags

Fixes #914

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index 35513783110db7f174b5f20ed7755712db961b79..d4298f9df24adfda803382664432693fc0015254 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -3,6 +3,6 @@ class Tracetag < ActiveRecord::Base
 
   belongs_to :trace, :foreign_key => "gpx_id"
 
 
   belongs_to :trace, :foreign_key => "gpx_id"
 

-  validates :trace, :presence => true, :associated => true
+  validates :trace, :associated => true

   validates :tag, :length => 1..255, :format => /\A[^\/;.,?]*\z/
 end
   validates :tag, :length => 1..255, :format => /\A[^\/;.,?]*\z/
 end

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 8b210ec2596dffc0773c73119242796f61d5ce19..ed1dbc862cb5ea78127f6474868372d992584f98 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -53,14 +53,16 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_tagstring
   end
 
   def test_tagstring

-    trace = Trace.new
+    trace = Trace.new(gpx_files(:public_trace_file).attributes)

     trace.tagstring = "foo bar baz"
     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_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
     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar baz", trace.tags[1].tag