X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19d62168607b8a355156b2c2e089b615ab4c9381..be541bcab21487560d4974215bd35be74012c492:/test/models/trace_test.rb?ds=inline

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 8fa09f4d7..66107771a 100644
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -166,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
@@ -193,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.where(:trace => trace).first.tile
   end
 
   def test_import_creates_icon