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

tests passing

Browse source
This commit is contained in:
Mikel Maron 2016-10-06 21:33:47 -04:00
parent 3c01d2e80d
commit e055eaf690
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/diary_entry_controller.rb
View file

@ -70,7 +70,7 @@ class DiaryEntryController < ApplicationController
end
# Add the commenter to the subscribers if necessary
@entry.subscriptions.create(user: @user) unless @entry.subscribers.exists?(@user)
@entry.subscriptions.create(user: @user) unless @entry.subscribers.exists?(@user.id)
redirect_to :controller => "diary_entry", :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
else
@ -83,7 +83,7 @@ class DiaryEntryController < ApplicationController
def subscribe
diary_entry = DiaryEntry.find(params[:id])
diary_entry.subscriptions.create(user: @user) unless diary_entry.subscribers.exists?(@user)
diary_entry.subscriptions.create(user: @user) unless diary_entry.subscribers.exists?(@user.id)
redirect_to :controller => "diary_entry", :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
rescue ActiveRecord::RecordNotFound
@ -93,7 +93,7 @@ class DiaryEntryController < ApplicationController
def unsubscribe
diary_entry = DiaryEntry.find(params[:id])
diary_entry.subscriptions.where(user: @user).delete_all if diary_entry.subscribers.exists?(@user)
diary_entry.subscriptions.where(user: @user).delete_all if diary_entry.subscribers.exists?(@user.id)
redirect_to :controller => "diary_entry", :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
rescue ActiveRecord::RecordNotFound

2
app/views/diary_entry/view.html.erb
View file

@ -21,7 +21,7 @@
<%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
<%= submit_tag t('diary_entry.view.save_button') %>
<% end %>
<% if @user and @entry.subscribers and @entry.subscribers.exists?(@user) %>
<% if @user and @entry.subscribers and @entry.subscribers.exists?(@user.id) %>
<div style='position:relative; top: -30px; left: 130px'><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<% elsif @user %>
<div style='position:relative; top: -30px; left: 130px'><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>

12
test/controllers/diary_entry_controller_test.rb
View file

@ -330,6 +330,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_select "h2", :text => "No entry with the id: 9999", :count => 1
end
post :subscribe, {:id => entry.id, :display_name => entry.user.display_name}, { :user => users(:normal_user).id}
# Now try an invalid comment with an empty body
assert_no_difference "ActionMailer::Base.deliveries.size" do
assert_no_difference "DiaryComment.count" do
@ -353,7 +355,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
email = ActionMailer::Base.deliveries.first
assert_equal [users(:normal_user).email], email.to
assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject
assert_equal "[OpenStreetMap] #{users(:public_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
@ -376,6 +378,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
def test_comment_spammy
# Find the entry to comment on
entry = create(:diary_entry, :user_id => users(:normal_user).id)
post :subscribe, {:id => entry.id, :display_name => entry.user.display_name}, { :user => users(:normal_user).id}
# Generate some spammy content
spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
@ -390,7 +393,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
email = ActionMailer::Base.deliveries.first
assert_equal [users(:normal_user).email], email.to
assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject
assert_equal "[OpenStreetMap] #{users(:public_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
@ -699,11 +702,6 @@ class DiaryEntryControllerTest < ActionController::TestCase
def test_unsubscribe_success
diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
assert_difference "diary_entry.subscribers.count", -1 do
post :unsubscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:normal_user).id}
end
assert_response :redirect
post :subscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}
assert_difference "diary_entry.subscribers.count", -1 do
post :unsubscribe, {:id => diary_entry.id, :display_name => diary_entry.user.display_name}, { :user => users(:public_user).id}