X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/77dcaef44c19d43a3944affbfcf2d037dc11aba5..400db5803633c92cf5ac0adf1ec7de32211aedea:/test/models/trace_test.rb diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb index 2ab1a3d5a..81120f0e7 100644 --- a/test/models/trace_test.rb +++ b/test/models/trace_test.rb @@ -2,23 +2,9 @@ require "test_helper" require "minitest/mock" class TraceTest < ActiveSupport::TestCase - def setup - @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") - Object.const_set("GPX_TRACE_DIR", Rails.root.join("test", "gpx", "traces")) - - @gpx_image_dir = Object.send("remove_const", "GPX_IMAGE_DIR") - Object.const_set("GPX_IMAGE_DIR", Rails.root.join("test", "gpx", "images")) - end - def teardown - File.unlink(*Dir.glob(File.join(GPX_TRACE_DIR, "*.gpx"))) - File.unlink(*Dir.glob(File.join(GPX_IMAGE_DIR, "*.gif"))) - - Object.send("remove_const", "GPX_TRACE_DIR") - Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir) - - Object.send("remove_const", "GPX_IMAGE_DIR") - Object.const_set("GPX_IMAGE_DIR", @gpx_image_dir) + File.unlink(*Dir.glob(File.join(Settings.gpx_trace_dir, "*.gpx"))) + File.unlink(*Dir.glob(File.join(Settings.gpx_image_dir, "*.gif"))) end def test_visible @@ -220,6 +206,10 @@ class TraceTest < ActiveSupport::TestCase trace.reload assert_equal 1, Tracepoint.where(:gpx_id => trace.id).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 end end @@ -227,7 +217,7 @@ class TraceTest < ActiveSupport::TestCase FakeFS do FakeFS::FileSystem.clone(Rails.root.join("test", "gpx")) trace = create(:trace, :fixture => "a") - icon_path = File.join(GPX_IMAGE_DIR, "#{trace.id}_icon.gif") + icon_path = File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif") FileUtils.rm(icon_path) assert_equal false, File.exist?(icon_path) @@ -241,7 +231,7 @@ class TraceTest < ActiveSupport::TestCase FakeFS do FakeFS::FileSystem.clone(Rails.root.join("test", "gpx")) trace = create(:trace, :fixture => "a") - large_picture_path = File.join(GPX_IMAGE_DIR, "#{trace.id}.gif") + large_picture_path = File.join(Settings.gpx_image_dir, "#{trace.id}.gif") FileUtils.rm(large_picture_path) assert_equal false, File.exist?(large_picture_path) @@ -271,8 +261,7 @@ class TraceTest < ActiveSupport::TestCase end def trace_valid(attrs, result = true) - entry = build(:trace) - entry.assign_attributes(attrs) + entry = build(:trace, attrs) assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}" end