X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2fabc46421f9e908ef6902ea7c4890a0032af446..5e90b569db1b0f09063d1eed0aada7a513b60dcb:/test/models/trace_test.rb?ds=sidebyside

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 1322964c2..af219db43 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -2,22 +2,6 @@ require "test_helper"
 require "gpx"
 
 class TraceTest < ActiveSupport::TestCase
-  # Use temporary directories with unique names for each test
-  # This allows the tests to be run in parallel.
-  def setup
-    @gpx_trace_dir_orig = Settings.gpx_trace_dir
-    @gpx_image_dir_orig = Settings.gpx_image_dir
-    Settings.gpx_trace_dir = Dir.mktmpdir("trace", Rails.root.join("test/gpx"))
-    Settings.gpx_image_dir = Dir.mktmpdir("image", Rails.root.join("test/gpx"))
-  end
-
-  def teardown
-    FileUtils.remove_dir(Settings.gpx_trace_dir)
-    FileUtils.remove_dir(Settings.gpx_image_dir)
-    Settings.gpx_trace_dir = @gpx_trace_dir_orig
-    Settings.gpx_image_dir = @gpx_image_dir_orig
-  end
-
   def test_visible
     public_trace_file = create(:trace)
     create(:trace, :deleted)
@@ -89,17 +73,21 @@ class TraceTest < ActiveSupport::TestCase
     trace_valid({ :visibility => "foo" }, :valid => false)
   end
 
-  def test_tagstring
+  def test_tagstring_handles_space_separated_tags
     trace = build(:trace)
     trace.tagstring = "foo bar baz"
-    assert trace.valid?
+    assert_predicate 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
+  end
+
+  def test_tagstring_handles_comma_separated_tags
+    trace = build(:trace)
     trace.tagstring = "foo, bar baz ,qux"
-    assert trace.valid?
+    assert_predicate trace, :valid?
     assert_equal 3, trace.tags.length
     assert_equal "foo", trace.tags[0].tag
     assert_equal "bar baz", trace.tags[1].tag
@@ -107,19 +95,30 @@ class TraceTest < ActiveSupport::TestCase
     assert_equal "foo, bar baz, qux", trace.tagstring
   end
 
+  def test_tagstring_strips_whitespace
+    trace = build(:trace)
+    trace.tagstring = "   zero  ,  one , two  "
+    assert_predicate trace, :valid?
+    assert_equal 3, trace.tags.length
+    assert_equal "zero", trace.tags[0].tag
+    assert_equal "one", trace.tags[1].tag
+    assert_equal "two", trace.tags[2].tag
+    assert_equal "zero, one, two", trace.tagstring
+  end
+
   def test_public?
-    assert build(:trace, :visibility => "public").public?
+    assert_predicate build(:trace, :visibility => "public"), :public?
     assert_not build(:trace, :visibility => "private").public?
     assert_not build(:trace, :visibility => "trackable").public?
-    assert build(:trace, :visibility => "identifiable").public?
-    assert build(:trace, :deleted, :visibility => "public").public?
+    assert_predicate build(:trace, :visibility => "identifiable"), :public?
+    assert_predicate build(:trace, :deleted, :visibility => "public"), :public?
   end
 
   def test_trackable?
     assert_not build(:trace, :visibility => "public").trackable?
     assert_not build(:trace, :visibility => "private").trackable?
-    assert build(:trace, :visibility => "trackable").trackable?
-    assert build(:trace, :visibility => "identifiable").trackable?
+    assert_predicate build(:trace, :visibility => "trackable"), :trackable?
+    assert_predicate build(:trace, :visibility => "identifiable"), :trackable?
     assert_not build(:trace, :deleted, :visibility => "public").trackable?
   end
 
@@ -127,7 +126,7 @@ class TraceTest < ActiveSupport::TestCase
     assert_not build(:trace, :visibility => "public").identifiable?
     assert_not build(:trace, :visibility => "private").identifiable?
     assert_not build(:trace, :visibility => "trackable").identifiable?
-    assert build(:trace, :visibility => "identifiable").identifiable?
+    assert_predicate build(:trace, :visibility => "identifiable"), :identifiable?
     assert_not build(:trace, :deleted, :visibility => "public").identifiable?
   end
 
@@ -167,14 +166,14 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
-    picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a.gif").read(:mode => "rb")
     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.large_picture
   end
 
   def test_icon_picture
-    picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")
+    picture = Rails.root.join("test/gpx/fixtures/a_icon.gif").read(:mode => "rb")
     trace = create(:trace, :fixture => "a")
 
     assert_equal picture, trace.icon_picture
@@ -194,16 +193,16 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_creates_tracepoints
     trace = create(:trace, :fixture => "a")
-    assert_equal 0, Tracepoint.where(:gpx_id => trace.id).count
+    assert_equal 0, Tracepoint.where(:trace => trace).count
 
     trace.import
 
     trace.reload
-    assert_equal 1, Tracepoint.where(:gpx_id => trace.id).count
+    assert_equal 1, Tracepoint.where(:trace => trace).count
 
     # Check that the tile has been set prior to the bulk import
     # i.e. that the callbacks have been run correctly
-    assert_equal 3221331576, Tracepoint.where(:gpx_id => trace.id).first.tile
+    assert_equal 3221331576, Tracepoint.find_by(:trace => trace).tile
   end
 
   def test_import_creates_icon
@@ -213,7 +212,7 @@ class TraceTest < ActiveSupport::TestCase
 
     trace.import
 
-    assert trace.icon.attached?
+    assert_predicate trace.icon, :attached?
   end
 
   def test_import_creates_large_picture
@@ -223,7 +222,7 @@ class TraceTest < ActiveSupport::TestCase
 
     trace.import
 
-    assert trace.image.attached?
+    assert_predicate trace.image, :attached?
   end
 
   def test_import_handles_bz2