X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a3618d2b5fcb991fef7786fbbbfd6d3e0ac88d28..966c66a0430d1929306d94a4b1f8e32bf97834d7:/test/factories/traces.rb?ds=sidebyside diff --git a/test/factories/traces.rb b/test/factories/traces.rb index 76fd90590..961d52988 100644 --- a/test/factories/traces.rb +++ b/test/factories/traces.rb @@ -1,29 +1,30 @@ -FactoryGirl.define do +FactoryBot.define do factory :trace do sequence(:name) { |n| "Trace #{n}.gpx" } sequence(:description) { |n| "This is trace #{n}" } user - timestamp Time.now - inserted true + timestamp { Time.now } + inserted { true } + size { 10 } trait :deleted do - visible false + visible { false } end transient do - fixture nil + fixture { nil } end after(:create) do |trace, evaluator| if evaluator.fixture - File.symlink(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gpx"), - Rails.root.join("test", "gpx", "traces", "#{trace.id}.gpx")) - File.symlink(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}.gif"), - Rails.root.join("test", "gpx", "images", "#{trace.id}.gif")) - File.symlink(Rails.root.join("test", "gpx", "fixtures", "#{evaluator.fixture}_icon.gif"), - Rails.root.join("test", "gpx", "images", "#{trace.id}_icon.gif")) + 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")) end end end