Merge remote-tracking branch 'upstream/pull/3300'

[rails.git] / test / factories / traces.rb

diff --git a/test/factories/traces.rb b/test/factories/traces.rb
index 76fd90590e6cbb782ffd9f55df0fe183b31475ea..961d52988fc0595c841e9464e9f4028b23447ef6 100644 (file)
--- 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