X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0ca2e10b1d42fc08ca024364be06955af71ed932..550c4a3a45814fde5c809334c85f1ebc47659a82:/test/controllers/browse_controller_test.rb diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index d9f4401bf..7ad16dcd9 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -137,7 +137,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest end def test_read_note_hidden_user_comment - hidden_user = create(:user, :status => "deleted") + hidden_user = create(:user, :deleted) note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note| create(:note_comment, :note => note, :author => hidden_user) end @@ -153,7 +153,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest def test_read_closed_note user = create(:user) - closed_note = create(:note_with_comments, :status => "closed", :closed_at => Time.now, :comments_count => 2) do |note| + 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 @@ -161,7 +161,7 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest assert_select "div.note-comments ul li", :count => 2 assert_select "div.details", /Resolved by #{user.display_name}/ - user.destroy + user.soft_destroy! reset!