Add closed_by attribute to :closed note factory trait

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 5cffbd702f8ebcfbf4b8eabe09094462e5ca1b0a..b2f14a127ea163d29f0d7bb2a5c7534027872db9 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -144,9 +144,7 @@ class NotesControllerTest < ActionDispatch::IntegrationTest
 
   def test_read_closed_note
     user = create(:user)
 
   def test_read_closed_note
     user = create(:user)

-    closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc, :comments_count => 2) do |note|
-      create(:note_comment, :event => "closed", :note => note, :author => user)
-    end
+    closed_note = create(:note_with_comments, :closed, :closed_by => user, :comments_count => 2)

 
     browse_check :note_path, closed_note.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 2
 
     browse_check :note_path, closed_note.id, "notes/show"
     assert_select "div.note-comments ul li", :count => 2

diff --git a/test/factories/notes.rb b/test/factories/notes.rb
index 63dcd78048c4d44e61ef9776de980f4512e4c814..ab7d5df5677cf87f6f277bbf76c22cec1386a0a7 100644 (file)
--- a/test/factories/notes.rb
+++ b/test/factories/notes.rb
@@ -5,11 +5,15 @@ FactoryBot.define do
     # tile { QuadTile.tile_for_point(1,1) }
 
     trait :closed do
     # tile { QuadTile.tile_for_point(1,1) }
 
     trait :closed do

+      transient do
+        closed_by { nil }
+      end
+

       status { "closed" }
       closed_at { Time.now.utc }
 
       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
 
       end
     end