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

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

diff --git a/test/factories/notes.rb b/test/factories/notes.rb
index 9dbcdf58cc94b02ba7a8b80c0f830add09169b87..ab7d5df5677cf87f6f277bbf76c22cec1386a0a7 100644 (file)
--- a/test/factories/notes.rb
+++ b/test/factories/notes.rb
@@ -1,12 +1,25 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :note do
-    latitude 1 * GeoRecord::SCALE
-    longitude 1 * GeoRecord::SCALE
-    # tile QuadTile.tile_for_point(1,1)
+    latitude { 1 * GeoRecord::SCALE }
+    longitude { 1 * GeoRecord::SCALE }
+    # tile { QuadTile.tile_for_point(1,1) }
+
+    trait :closed do
+      transient do
+        closed_by { nil }
+      end
+
+      status { "closed" }
+      closed_at { Time.now.utc }
+
+      after(:create) do |note, context|
+        create(:note_comment, :author => context.closed_by, :body => "Closing comment", :event => "closed", :note => note)
+      end
+    end
 
     factory :note_with_comments do
       transient do
-        comments_count 1
+        comments_count { 1 }
       end
 
       after(:create) do |note, evaluator|