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

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

diff --git a/test/factories/traces.rb b/test/factories/traces.rb
index 961d52988fc0595c841e9464e9f4028b23447ef6..88c57745b1db17e41e00a738b126f5b375402efd 100644 (file)
--- a/test/factories/traces.rb
+++ b/test/factories/traces.rb
@@ -5,7 +5,7 @@ FactoryBot.define do
 
     user
 
 
     user
 

-    timestamp { Time.now }
+    timestamp { Time.now.utc }

     inserted { true }
     size { 10 }
 
     inserted { true }
     size { 10 }
 


@@ -17,14 +17,14 @@ FactoryBot.define do
       fixture { nil }
     end
 
       fixture { nil }
     end
 

-    after(:create) do |trace, evaluator|
+    after(:build) do |user, evaluator|

       if evaluator.fixture
       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
       end
     end
   end