X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/24b138db094e4b5e8d062c5248ee867967dc0fd7..ff7ddb6b86bf918a9418af7382836b41594d45e4:/test/models/trace_test.rb

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 24c66c490..e0c65e33e 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,4 +1,5 @@
 require "test_helper"
+require "gpx"
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase
@@ -146,7 +147,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_xml_file
     check_xml_file("a", "848caa72f2f456d1bd6a0fdf228aa1b9")
-    check_xml_file("b", "66179ca44f1e93d8df62e2b88cbea732")
+    check_xml_file("b", "db4cb5ed2d7d2b627b3b504296c4f701")
     check_xml_file("c", "848caa72f2f456d1bd6a0fdf228aa1b9")
     check_xml_file("d", "abd6675fdf3024a84fc0a1deac147c0d")
     check_xml_file("f", "a7c05d676c77dc14369c21be216a3713")
@@ -156,7 +157,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_large_picture
-    picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a.gif"), :mode => "rb")
+    picture = File.read(Rails.root.join("test/gpx/fixtures/a.gif"), :mode => "rb")
 
     trace = Trace.create
     trace.large_picture = picture
@@ -167,7 +168,7 @@ class TraceTest < ActiveSupport::TestCase
   end
 
   def test_icon_picture
-    picture = File.read(Rails.root.join("test", "gpx", "fixtures", "a_icon.gif"), :mode => "rb")
+    picture = File.read(Rails.root.join("test/gpx/fixtures/a_icon.gif"), :mode => "rb")
 
     trace = Trace.create
     trace.icon_picture = picture
@@ -183,7 +184,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_removes_previous_tracepoints
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace = create(:trace, :fixture => "a")
       # Tracepoints don't have a primary key, so we use a specific latitude to
       # check for successful deletion
@@ -198,7 +199,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_creates_tracepoints
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace = create(:trace, :fixture => "a")
       assert_equal 0, Tracepoint.where(:gpx_id => trace.id).count
 
@@ -215,7 +216,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_creates_icon
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace = create(:trace, :fixture => "a")
       icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")
       FileUtils.rm(icon_path)
@@ -229,7 +230,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_creates_large_picture
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace = create(:trace, :fixture => "a")
       large_picture_path = File.join(Settings.gpx_image_dir, "#{trace.id}.gif")
       FileUtils.rm(large_picture_path)
@@ -243,7 +244,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_handles_bz2
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace = create(:trace, :fixture => "c")
 
       trace.import
@@ -254,7 +255,7 @@ class TraceTest < ActiveSupport::TestCase
 
   def test_import_handles_plain
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace = create(:trace, :fixture => "a")
 
       trace.import
@@ -263,11 +264,22 @@ class TraceTest < ActiveSupport::TestCase
     end
   end
 
+  def test_import_handles_plain_with_bom
+    FakeFS do
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
+      trace = create(:trace, :fixture => "b")
+
+      trace.import
+
+      assert_equal 1, trace.size
+    end
+  end
+
   def test_import_handles_gz
     trace = create(:trace, :fixture => "d")
 
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace.import
 
       assert_equal 1, trace.size
@@ -280,7 +292,7 @@ class TraceTest < ActiveSupport::TestCase
     trace = create(:trace, :fixture => "f")
 
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace.import
 
       assert_equal 2, trace.size
@@ -293,7 +305,7 @@ class TraceTest < ActiveSupport::TestCase
     trace = create(:trace, :fixture => "g")
 
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace.import
 
       assert_equal 2, trace.size
@@ -306,7 +318,7 @@ class TraceTest < ActiveSupport::TestCase
     trace = create(:trace, :fixture => "h")
 
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace.import
 
       assert_equal 2, trace.size
@@ -319,7 +331,7 @@ class TraceTest < ActiveSupport::TestCase
     trace = create(:trace, :fixture => "i")
 
     FakeFS do
-      FakeFS::FileSystem.clone(Rails.root.join("test", "gpx"))
+      FakeFS::FileSystem.clone(Rails.root.join("test/gpx"))
       trace.import
 
       assert_equal 2, trace.size