require "test_helper"
class DiaryEntryControllerTest < ActionController::TestCase
- fixtures :users, :user_roles, :languages, :friends
+ fixtures :users, :user_roles, :languages
include ActionView::Helpers::NumberHelper
)
assert_routing(
{ :path => "/user/username/diary/1/subscribe", :method => :post },
- { :controller => "diary_entry", :action => "subscribe", :id => "1" }
+ { :controller => "diary_entry", :action => "subscribe", :display_name => "username", :id => "1" }
)
assert_routing(
{ :path => "/user/username/diary/1/unsubscribe", :method => :post },
- { :controller => "diary_entry", :action => "unsubscribe", :id => "1" }
+ { :controller => "diary_entry", :action => "unsubscribe", :display_name => "username", :id => "1" }
)
end
end
def test_edit
- entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ entry = create(:diary_entry, :user => users(:normal_user))
# Make sure that you are redirected to the login page when you are
# not logged in, without and with the id of the entry you want to edit
end
def test_comment
- entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ entry = create(:diary_entry, :user => users(:normal_user))
# Make sure that you are denied when you are not logged in
post :comment, :display_name => entry.user.display_name, :id => entry.id
assert_select "h2", :text => "No entry with the id: 9999", :count => 1
end
- # FIXME assert number of subscribers
+ 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
- post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, { :user => users(:public_user).id }
+ assert_no_difference "entry.subscribers.count" do
+ post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } }, { :user => users(:public_user).id }
+ end
end
end
assert_response :success
assert_template :view
- # FIXME assert number of subscribers
# Now try again with the right id
- assert_difference "ActionMailer::Base.deliveries.size", 1 do
+ assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
assert_difference "DiaryComment.count", 1 do
- post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } }, { :user => users(:public_user).id }
+ assert_difference "entry.subscribers.count", 1 do
+ post :comment, { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } }, { :user => users(:public_user).id }
+ end
end
end
assert_response :redirect
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
assert_equal users(:public_user).id, comment.user_id
assert_equal "New comment", comment.body
- # FIXME check number of subscribers
-
# Now view the diary entry, and check the new comment is present
get :view, :display_name => entry.user.display_name, :id => entry.id
assert_response :success
def test_comment_spammy
# Find the entry to comment on
- entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ entry = create(:diary_entry, :user => users(:normal_user))
+ 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(" ")
- # FIXME assert number of subscribers
# Try creating a spammy comment
assert_difference "ActionMailer::Base.deliveries.size", 1 do
assert_difference "DiaryComment.count", 1 do
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
def test_list_all
diary_entry = create(:diary_entry)
geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781)
- public_entry = create(:diary_entry, :user_id => users(:public_user).id)
+ public_entry = create(:diary_entry, :user => users(:public_user))
# Try a list of all diary entries
get :list
end
def test_list_user
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
- geo_entry = create(:diary_entry, :user_id => users(:normal_user).id, :latitude => 51.50763, :longitude => -0.10781)
- _other_entry = create(:diary_entry, :user_id => users(:public_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
+ geo_entry = create(:diary_entry, :user => users(:normal_user), :latitude => 51.50763, :longitude => -0.10781)
+ _other_entry = create(:diary_entry, :user => users(:public_user))
# Try a list of diary entries for a valid user
get :list, :display_name => users(:normal_user).display_name
end
def test_list_friends
- diary_entry = create(:diary_entry, :user_id => friends(:normal_user_with_second_user).friend_user_id)
- _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id)
+ friend = create(:friend, :befriender => users(:normal_user))
+ diary_entry = create(:diary_entry, :user => friend.befriendee)
+ _other_entry = create(:diary_entry, :user => users(:second_public_user))
# Try a list of diary entries for your friends when not logged in
get :list, :friends => true
end
def test_list_nearby
- diary_entry = create(:diary_entry, :user_id => users(:public_user).id)
+ diary_entry = create(:diary_entry, :user => users(:public_user))
# Try a list of diary entries for nearby users when not logged in
get :list, :nearby => true
end
def test_rss_user
- create(:diary_entry, :user_id => users(:normal_user).id)
- create(:diary_entry, :user_id => users(:normal_user).id)
- create(:diary_entry, :user_id => users(:public_user).id)
+ create(:diary_entry, :user => users(:normal_user))
+ create(:diary_entry, :user => users(:normal_user))
+ create(:diary_entry, :user => users(:public_user))
get :rss, :display_name => users(:normal_user).display_name, :format => :rss
assert_response :success, "Should be able to get a specific users diary RSS"
def test_view
# Try a normal entry that should work
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
assert_response :success
assert_template :view
# Try a deleted entry
- diary_entry_deleted = create(:diary_entry, :user_id => users(:normal_user).id, :visible => false)
+ diary_entry_deleted = create(:diary_entry, :user => users(:normal_user), :visible => false)
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry_deleted.id
assert_response :not_found
# Try an entry by a suspended user
- diary_entry_suspended = create(:diary_entry, :user_id => users(:suspended_user).id)
+ diary_entry_suspended = create(:diary_entry, :user => users(:suspended_user))
get :view, :display_name => users(:suspended_user).display_name, :id => diary_entry_suspended.id
assert_response :not_found
# Try an entry by a deleted user
- diary_entry_deleted = create(:diary_entry, :user_id => users(:deleted_user).id)
+ diary_entry_deleted = create(:diary_entry, :user => users(:deleted_user))
get :view, :display_name => users(:deleted_user).display_name, :id => diary_entry_deleted.id
assert_response :not_found
end
# Get a diary entry that has hidden comments
diary_entry = create(:diary_entry)
visible_comment = create(:diary_comment, :diary_entry => diary_entry)
- suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:suspended_user).id)
- deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:deleted_user).id)
+ suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => users(:suspended_user))
+ deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => users(:deleted_user))
hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id
end
def test_hidecomment
- diary_entry = create(:diary_entry, :user_id => users(:normal_user).id)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
diary_comment = create(:diary_comment, :diary_entry => diary_entry)
# Try without logging in
post :hidecomment, :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id
end
# Test a user with a comment
- create(:diary_comment, :user_id => users(:public_user).id)
+ create(:diary_comment, :user => users(:public_user))
get :comments, :display_name => users(:public_user).display_name
assert_response :success
assert_response :not_found
end
- ##
- # test subscribe success
def test_subscribe_success
- basic_authorization(users(:public_user).email, "test")
- changeset = changesets(:normal_user_closed_change)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
- assert_difference "changeset.subscribers.count", 1 do
- post :subscribe, :id => changeset.id
+ assert_difference "diary_entry.subscribers.count", 1 do
+ post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
end
- assert_response :success
+ assert_response :redirect
end
- ##
- # test subscribe fail
def test_subscribe_fail
- # unauthorized
- changeset = changesets(:normal_user_closed_change)
- assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => changeset.id
- end
- assert_response :unauthorized
-
- basic_authorization(users(:public_user).email, "test")
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
- # bad changeset id
- assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => 999111
+ # not signed in
+ assert_no_difference "diary_entry.subscribers.count" do
+ post :subscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
end
- assert_response :not_found
+ assert_response :forbidden
- # not closed changeset
- changeset = changesets(:normal_user_first_change)
- assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => changeset.id
- end
- assert_response :conflict
+ # bad diary id
+ post :subscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }
+ assert_response :not_found
# trying to subscribe when already subscribed
- changeset = changesets(:normal_user_subscribed_change)
- assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => changeset.id
+ post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
+ assert_no_difference "diary_entry.subscribers.count" do
+ post :subscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
end
- assert_response :conflict
end
- ##
- # test unsubscribe success
def test_unsubscribe_success
- basic_authorization(users(:public_user).email, "test")
- changeset = changesets(:normal_user_subscribed_change)
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
- assert_difference "changeset.subscribers.count", -1 do
- post :unsubscribe, :id => changeset.id
+ 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 }
end
- assert_response :success
+ assert_response :redirect
end
- ##
- # test unsubscribe fail
def test_unsubscribe_fail
- # unauthorized
- changeset = changesets(:normal_user_closed_change)
- assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => changeset.id
- end
- assert_response :unauthorized
+ diary_entry = create(:diary_entry, :user => users(:normal_user))
- basic_authorization(users(:public_user).email, "test")
-
- # bad changeset id
- assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => 999111
+ # not signed in
+ assert_no_difference "diary_entry.subscribers.count" do
+ post :unsubscribe, :id => diary_entry.id, :display_name => diary_entry.user.display_name
end
- assert_response :not_found
+ assert_response :forbidden
- # not closed changeset
- changeset = changesets(:normal_user_first_change)
- assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => changeset.id
- end
- assert_response :conflict
+ # bad diary id
+ post :unsubscribe, { :id => 999111, :display_name => "username" }, { :user => users(:public_user).id }
+ assert_response :not_found
# trying to unsubscribe when not subscribed
- changeset = changesets(:normal_user_closed_change)
- assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => changeset.id
+ assert_no_difference "diary_entry.subscribers.count" do
+ post :unsubscribe, { :id => diary_entry.id, :display_name => diary_entry.user.display_name }, { :user => users(:public_user).id }
end
- assert_response :not_found
end
private
projects / rails.git / blobdiff