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

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

diff --git a/test/factories/traces.rb b/test/factories/traces.rb
index 66f810468e20a1c81c8113bf1c92fa454c490044..88c57745b1db17e41e00a738b126f5b375402efd 100644 (file)
--- a/test/factories/traces.rb
+++ b/test/factories/traces.rb
@@ -1,30 +1,30 @@
-FactoryGirl.define do
+FactoryBot.define do

   factory :trace do
     sequence(:name) { |n| "Trace #{n}.gpx" }
     sequence(:description) { |n| "This is trace #{n}" }
 
   factory :trace do
     sequence(:name) { |n| "Trace #{n}.gpx" }
     sequence(:description) { |n| "This is trace #{n}" }
 

-    # Fixme requires User Factory
-    user_id 1
+    user

 
 

-    timestamp Time.now
-    inserted true
+    timestamp { Time.now.utc }
+    inserted { true }
+    size { 10 }

 
     trait :deleted do
 
     trait :deleted do

-      visible false
+      visible { false }

     end
 
     transient do
     end
 
     transient do

-      fixture nil
+      fixture { nil }

     end
 
     end
 

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

       if evaluator.fixture
       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"))
+        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