Move diary comment action to comments controller
This commit is contained in:
Anton Khorev
parent
b69159795b
commit
00c2589374
8 changed files with 154 additions and 151 deletions
|
|
@ -69,10 +69,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
|
|||
{ :path => "/user/username/diary/1", :method => :put },
|
||||
{ :controller => "diary_entries", :action => "update", :display_name => "username", :id => "1" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/user/username/diary/1/newcomment", :method => :post },
|
||||
{ :controller => "diary_entries", :action => "comment", :display_name => "username", :id => "1" }
|
||||
)
|
||||
assert_routing(
|
||||
{ :path => "/user/username/diary/1/hide", :method => :post },
|
||||
{ :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" }
|
||||
|
|
@ -340,113 +336,6 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
|
|||
assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
|
||||
end
|
||||
|
||||
def test_comment
|
||||
user = create(:user)
|
||||
other_user = create(:user)
|
||||
entry = create(:diary_entry, :user => user)
|
||||
create(:diary_entry_subscription, :diary_entry => entry, :user => user)
|
||||
|
||||
# Make sure that you are denied when you are not logged in
|
||||
post comment_diary_entry_path(entry.user, entry)
|
||||
assert_response :forbidden
|
||||
|
||||
session_for(other_user)
|
||||
|
||||
# Verify that you get a not found error, when you pass a bogus id
|
||||
post comment_diary_entry_path(entry.user, :id => 9999)
|
||||
assert_response :not_found
|
||||
assert_select "div.content-heading", :count => 1 do
|
||||
assert_select "h1", :text => "No entry with the id: 9999", :count => 1
|
||||
end
|
||||
|
||||
# Now try an invalid comment with an empty body
|
||||
assert_no_difference "ActionMailer::Base.deliveries.size" do
|
||||
assert_no_difference "DiaryComment.count" do
|
||||
assert_no_difference "entry.subscribers.count" do
|
||||
perform_enqueued_jobs do
|
||||
post comment_diary_entry_path(entry.user, entry, :diary_comment => { :body => "" })
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
assert_response :success
|
||||
assert_template :show
|
||||
|
||||
# Now try again with the right id
|
||||
assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
|
||||
assert_difference "DiaryComment.count", 1 do
|
||||
assert_difference "entry.subscribers.count", 1 do
|
||||
perform_enqueued_jobs do
|
||||
post comment_diary_entry_path(entry.user, entry, :diary_comment => { :body => "New comment" })
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.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
|
||||
|
||||
# Now show the diary entry, and check the new comment is present
|
||||
get diary_entry_path(entry.user, entry)
|
||||
assert_response :success
|
||||
assert_select ".diary-comment", :count => 1 do
|
||||
assert_select "#comment#{comment.id}", :count => 1 do
|
||||
assert_select "a[href='/user/#{ERB::Util.u(other_user.display_name)}']", :text => other_user.display_name, :count => 1
|
||||
end
|
||||
assert_select ".richtext", :text => /New comment/, :count => 1
|
||||
end
|
||||
end
|
||||
|
||||
def test_comment_spammy
|
||||
user = create(:user)
|
||||
other_user = create(:user)
|
||||
entry = create(:diary_entry, :user => user)
|
||||
create(:diary_entry_subscription, :diary_entry => entry, :user => user)
|
||||
|
||||
session_for(other_user)
|
||||
|
||||
# Generate some spammy content
|
||||
spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
|
||||
|
||||
# Try creating a spammy comment
|
||||
assert_difference "ActionMailer::Base.deliveries.size", 1 do
|
||||
assert_difference "DiaryComment.count", 1 do
|
||||
perform_enqueued_jobs do
|
||||
post comment_diary_entry_path(entry.user, entry, :diary_comment => { :body => spammy_text })
|
||||
end
|
||||
end
|
||||
end
|
||||
assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.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
|
||||
assert_equal "suspended", User.find(other_user.id).status
|
||||
|
||||
# Follow the redirect
|
||||
get diary_entries_path(:display_name => user.display_name)
|
||||
assert_redirected_to :controller => :users, :action => :suspended
|
||||
|
||||
# Now show the diary entry, and check the new comment is not present
|
||||
get diary_entry_path(entry.user, entry)
|
||||
assert_response :success
|
||||
assert_select ".diary-comment", :count => 0
|
||||
end
|
||||
|
||||
def test_index_all
|
||||
diary_entry = create(:diary_entry)
|
||||
geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue