cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Redirect to newly created diary comment

Browse source
This commit is contained in:
Anton Khorev 2024-08-07 04:59:09 +03:00
parent 4c00c57c0b
commit 5e3cda345a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/controllers/diary_comments_controller_test.rb
View file

@ -115,14 +115,14 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
end
end
end
assert_redirected_to diary_entry_path(entry.user, entry)
comment = DiaryComment.last
assert_redirected_to diary_entry_path(entry.user, entry, :anchor => "comment#{comment.id}")
email = ActionMailer::Base.deliveries.first
assert_equal [user.email], email.to
assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
assert_match(/New comment/, email.text_part.decoded)
assert_match(/New comment/, email.html_part.decoded)
ActionMailer::Base.deliveries.clear
comment = DiaryComment.order(:id).last
assert_equal entry.id, comment.diary_entry_id
assert_equal other_user.id, comment.user_id
assert_equal "New comment", comment.body
@ -157,14 +157,14 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
end
end
end
assert_redirected_to diary_entry_path(entry.user, entry)
comment = DiaryComment.last
assert_redirected_to diary_entry_path(entry.user, entry, :anchor => "comment#{comment.id}")
email = ActionMailer::Base.deliveries.first
assert_equal [user.email], email.to
assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
assert_match %r{http://example.com/spam}, email.text_part.decoded
assert_match %r{http://example.com/spam}, email.html_part.decoded
ActionMailer::Base.deliveries.clear
comment = DiaryComment.order(:id).last
assert_equal entry.id, comment.diary_entry_id
assert_equal other_user.id, comment.user_id
assert_equal spammy_text, comment.body