X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/043d29fd7eb72048cf5d07edfbc20ec5c25af708..335c09cd338091037f7b047f2b488b66ea5a1b88:/test/factories/notes.rb

diff --git a/test/factories/notes.rb b/test/factories/notes.rb
index 9dbcdf58c..268a2bfb7 100644
--- a/test/factories/notes.rb
+++ b/test/factories/notes.rb
@@ -1,16 +1,30 @@
-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 }
+    description { "Default note's description" }
+
+    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|
-        create_list(:note_comment, evaluator.comments_count, :note => note)
+        create(:note_comment, :event => "opened", :note => note)
+        create_list(:note_comment, evaluator.comments_count - 1, :note => note)
       end
     end
   end