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

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

diff --git a/test/factories/notes.rb b/test/factories/notes.rb
index 63dcd78048c4d44e61ef9776de980f4512e4c814..268a2bfb7a489a4f679e0f3f03e71a38be0b245f 100644 (file)
--- a/test/factories/notes.rb
+++ b/test/factories/notes.rb
@@ -2,14 +2,18 @@ FactoryBot.define do
   factory :note do
     latitude { 1 * GeoRecord::SCALE }
     longitude { 1 * GeoRecord::SCALE }
-    # tile { QuadTile.tile_for_point(1,1) }
+    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|
-        create(:note_comment, :body => "Closing comment", :event => "closed", :note => note)
+      after(:create) do |note, context|
+        create(:note_comment, :author => context.closed_by, :body => "Closing comment", :event => "closed", :note => note)
       end
     end
 
@@ -19,7 +23,8 @@ FactoryBot.define do
       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