X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92ca4069957666065194e0b63de5b46261b8a21d..2d7e0a397a1b2dbed74f40439c1305b1b48a063e:/test/factories/traces.rb diff --git a/test/factories/traces.rb b/test/factories/traces.rb index 961d52988..88c57745b 100644 --- a/test/factories/traces.rb +++ b/test/factories/traces.rb @@ -5,7 +5,7 @@ FactoryBot.define do user - timestamp { Time.now } + timestamp { Time.now.utc } inserted { true } size { 10 } @@ -17,14 +17,14 @@ FactoryBot.define do fixture { nil } end - after(:create) do |trace, evaluator| + after(:build) do |user, evaluator| if evaluator.fixture - FileUtils.copy(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gpx"), - File.join(Settings.gpx_trace_dir, "#{trace.id}.gpx")) - FileUtils.copy(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gif"), - File.join(Settings.gpx_image_dir, "#{trace.id}.gif")) - FileUtils.copy(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}_icon.gif"), - File.join(Settings.gpx_image_dir, "#{trace.id}_icon.gif")) + user.file.attach(Rack::Test::UploadedFile.new(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gpx"))) + + if evaluator.inserted + user.image.attach(Rack::Test::UploadedFile.new(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gif"))) + user.icon.attach(Rack::Test::UploadedFile.new(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}_icon.gif"))) + end end end end