From cd3db7df4d111d04fe121e3d91b06007b8a98e31 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 27 Feb 2015 10:04:40 +0000 Subject: [PATCH] Fix validation failures for trace tags Fixes #914 --- app/models/tracetag.rb | 2 +- test/models/trace_test.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb index 355137831..d4298f9df 100644 --- 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" - validates :trace, :presence => true, :associated => true + validates :trace, :associated => true validates :tag, :length => 1..255, :format => /\A[^\/;.,?]*\z/ end diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb index 8b210ec25..ed1dbc862 100644 --- a/test/models/trace_test.rb +++ b/test/models/trace_test.rb @@ -53,14 +53,16 @@ class TraceTest < ActiveSupport::TestCase 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 -- 2.43.2