More cleanup after tests.

[rails.git] / test / controllers / trace_controller_test.rb

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index b2f7c01b043e7821810c1935bc912f687f2b3fa1..2fec258af4855a2cfe0ecd8a54a3fe6f0ee647ad 100644 (file)
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -491,7 +491,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.order(:id => :desc).first
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
     trace = Trace.order(:id => :desc).first
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description

-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)

     assert_equal "trackable", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
     assert_equal "trackable", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read


@@ -717,7 +717,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description

-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)

     assert_equal "trackable", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
     assert_equal "trackable", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read


@@ -735,7 +735,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description

-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)

     assert_equal "public", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
     assert_equal "public", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read


@@ -753,7 +753,7 @@ class TraceControllerTest < ActionController::TestCase
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description
     trace = Trace.find(response.body.to_i)
     assert_equal "1.gpx", trace.name
     assert_equal "New Trace", trace.description

-    assert_equal "new, trace", trace.tagstring
+    assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)

     assert_equal "private", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
     assert_equal "private", trace.visibility
     assert_equal false, trace.inserted
     assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read