require "test_helper"
class NotesControllerTest < ActionController::TestCase
- fixtures :users, :user_roles
+ def setup
+ # Stub nominatim response for note locations
+ stub_request(:get, %r{^http://nominatim\.openstreetmap\.org/reverse\?})
+ .to_return(:status => 404)
+ end
##
# test all routes which lead to this controller
end
end
assert_response :bad_request
+
+ assert_no_difference "Note.count" do
+ assert_no_difference "NoteComment.count" do
+ post :create, :lat => -1.0, :lon => -1.0, :text => "x\u0000y"
+ end
+ end
+ assert_response :bad_request
end
def test_comment_success
- open_note_with_comment = create(:note)
- create(:note_comment, :note => open_note_with_comment)
+ open_note_with_comment = create(:note_with_comments)
assert_difference "NoteComment.count", 1 do
assert_no_difference "ActionMailer::Base.deliveries.size" do
post :comment, :id => open_note_with_comment.id, :text => "This is an additional comment", :format => "json"
assert_nil js["properties"]["comments"].last["user"]
# Ensure that emails are sent to users
- note_with_comments_by_users = create(:note)
- create(:note_comment, :note => note_with_comments_by_users, :author_id => users(:normal_user).id)
- create(:note_comment, :note => note_with_comments_by_users, :author_id => users(:second_public_user).id)
+ first_user = create(:user)
+ second_user = create(:user)
+ third_user = create(:user)
+
+ note_with_comments_by_users = create(:note) do |note|
+ create(:note_comment, :note => note, :author => first_user)
+ create(:note_comment, :note => note, :author => second_user)
+ end
assert_difference "NoteComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
post :comment, :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json"
assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
assert_nil js["properties"]["comments"].last["user"]
- email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@openstreetmap.org" }
+ email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
assert_not_nil email
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] An anonymous user has commented on one of your notes", email.subject
- email = ActionMailer::Base.deliveries.find { |e| e.to.first == "public@OpenStreetMap.org" }
+ email = ActionMailer::Base.deliveries.find { |e| e.to.first == second_user.email }
assert_not_nil email
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] An anonymous user has commented on a note you are interested in", email.subject
ActionMailer::Base.deliveries.clear
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(third_user.email, "test")
assert_difference "NoteComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
assert_equal 4, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
- assert_equal "test2", js["properties"]["comments"].last["user"]
+ assert_equal third_user.display_name, js["properties"]["comments"].last["user"]
- email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@openstreetmap.org" }
+ email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
assert_not_nil email
assert_equal 1, email.to.length
- assert_equal "[OpenStreetMap] test2 has commented on one of your notes", email.subject
- assert_equal "test@openstreetmap.org", email.to.first
+ assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on one of your notes", email.subject
+ assert_equal first_user.email, email.to.first
- email = ActionMailer::Base.deliveries.find { |e| e.to.first == "public@OpenStreetMap.org" }
+ email = ActionMailer::Base.deliveries.find { |e| e.to.first == second_user.email }
assert_not_nil email
assert_equal 1, email.to.length
- assert_equal "[OpenStreetMap] test2 has commented on a note you are interested in", email.subject
+ assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject
get :show, :id => note_with_comments_by_users.id, :format => "json"
assert_response :success
assert_equal 4, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
- assert_equal "test2", js["properties"]["comments"].last["user"]
+ assert_equal third_user.display_name, js["properties"]["comments"].last["user"]
ActionMailer::Base.deliveries.clear
end
def test_comment_fail
- open_note_with_comment = create(:note_comment).note
+ open_note_with_comment = create(:note_with_comments)
+
assert_no_difference "NoteComment.count" do
post :comment, :text => "This is an additional comment"
end
end
assert_response :not_found
- hidden_note_with_comment = create(:note, :status => "hidden")
- create(:note_comment, :note => hidden_note_with_comment)
+ hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
+
assert_no_difference "NoteComment.count" do
post :comment, :id => hidden_note_with_comment.id, :text => "This is an additional comment"
end
assert_response :gone
- closed_note_with_comment = create(:note, :status => "closed", :closed_at => Time.now)
- create(:note_comment, :note => closed_note_with_comment)
+ closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+
assert_no_difference "NoteComment.count" do
post :comment, :id => closed_note_with_comment.id, :text => "This is an additional comment"
end
assert_response :conflict
+
+ assert_no_difference "NoteComment.count" do
+ post :comment, :id => open_note_with_comment.id, :text => "x\u0000y"
+ end
+ assert_response :bad_request
end
def test_close_success
- open_note_with_comment = create(:note)
- create(:note_comment, :note => open_note_with_comment)
+ open_note_with_comment = create(:note_with_comments)
+ user = create(:user)
+
post :close, :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json"
assert_response :unauthorized
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(user.email, "test")
post :close, :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json"
assert_response :success
assert_equal 2, js["properties"]["comments"].count
assert_equal "closed", js["properties"]["comments"].last["action"]
assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
- assert_equal "test2", js["properties"]["comments"].last["user"]
+ assert_equal user.display_name, js["properties"]["comments"].last["user"]
get :show, :id => open_note_with_comment.id, :format => "json"
assert_response :success
assert_equal 2, js["properties"]["comments"].count
assert_equal "closed", js["properties"]["comments"].last["action"]
assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
- assert_equal "test2", js["properties"]["comments"].last["user"]
+ assert_equal user.display_name, js["properties"]["comments"].last["user"]
end
def test_close_fail
post :close
assert_response :unauthorized
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(create(:user).email, "test")
post :close
assert_response :bad_request
post :close, :id => 12345
assert_response :not_found
- hidden_note_with_comment = create(:note, :status => "hidden")
- create(:note_comment, :note => hidden_note_with_comment)
+ hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
+
post :close, :id => hidden_note_with_comment.id
assert_response :gone
- closed_note_with_comment = create(:note, :status => "closed", :closed_at => Time.now)
+ closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+
post :close, :id => closed_note_with_comment.id
assert_response :conflict
end
def test_reopen_success
- closed_note_with_comment = create(:note, :status => "closed", :closed_at => Time.now)
- create(:note_comment, :note => closed_note_with_comment)
+ closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now)
+ user = create(:user)
+
post :reopen, :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json"
assert_response :unauthorized
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(user.email, "test")
post :reopen, :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json"
assert_response :success
assert_equal 2, js["properties"]["comments"].count
assert_equal "reopened", js["properties"]["comments"].last["action"]
assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
- assert_equal "test2", js["properties"]["comments"].last["user"]
+ assert_equal user.display_name, js["properties"]["comments"].last["user"]
get :show, :id => closed_note_with_comment.id, :format => "json"
assert_response :success
assert_equal 2, js["properties"]["comments"].count
assert_equal "reopened", js["properties"]["comments"].last["action"]
assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
- assert_equal "test2", js["properties"]["comments"].last["user"]
+ assert_equal user.display_name, js["properties"]["comments"].last["user"]
end
def test_reopen_fail
- hidden_note_with_comment = create(:note, :status => "hidden")
- create(:note_comment, :note => hidden_note_with_comment)
+ hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
+
post :reopen, :id => hidden_note_with_comment.id
assert_response :unauthorized
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(create(:user).email, "test")
post :reopen, :id => 12345
assert_response :not_found
post :reopen, :id => hidden_note_with_comment.id
assert_response :gone
- open_note_with_comment = create(:note)
- create(:note_comment, :note => open_note_with_comment)
+ open_note_with_comment = create(:note_with_comments)
+
post :reopen, :id => open_note_with_comment.id
assert_response :conflict
end
def test_show_success
- open_note = create(:note)
- create(:note_comment, :note => open_note)
+ open_note = create(:note_with_comments)
+
get :show, :id => open_note.id, :format => "xml"
assert_response :success
assert_equal "application/xml", @response.content_type
assert_select "time", :count => 1
assert_select "name", "Note: #{open_note.id}"
assert_select "desc", :count => 1
- assert_select "link[href='http://www.openstreetmap.org/note/#{open_note.id}']", :count => 1
+ assert_select "link[href='http://test.host/note/#{open_note.id}']", :count => 1
assert_select "extensions", :count => 1 do
assert_select "id", open_note.id.to_s
assert_select "url", note_url(open_note, :format => "gpx")
end
def test_show_hidden_comment
- note_with_hidden_comment = create(:note)
- create(:note_comment, :note => note_with_hidden_comment, :body => "Valid comment for hidden note")
- create(:note_comment, :note => note_with_hidden_comment, :visible => false)
- create(:note_comment, :note => note_with_hidden_comment, :body => "Another valid comment for hidden note")
+ note_with_hidden_comment = create(:note) do |note|
+ create(:note_comment, :note => note, :body => "Valid comment for hidden note")
+ create(:note_comment, :note => note, :visible => false)
+ create(:note_comment, :note => note, :body => "Another valid comment for hidden note")
+ end
get :show, :id => note_with_hidden_comment.id, :format => "json"
assert_response :success
end
def test_destroy_success
- open_note_with_comment = create(:note)
- create(:note_comment, :note => open_note_with_comment)
+ open_note_with_comment = create(:note_with_comments)
+ user = create(:user)
+ moderator_user = create(:moderator_user)
+
delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
assert_response :unauthorized
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(user.email, "test")
delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
assert_response :forbidden
- basic_authorization(users(:moderator_user).email, "test")
+ basic_authorization(moderator_user.email, "test")
delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
assert_response :success
assert_equal 2, js["properties"]["comments"].count
assert_equal "hidden", js["properties"]["comments"].last["action"]
assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
- assert_equal "moderator", js["properties"]["comments"].last["user"]
+ assert_equal moderator_user.display_name, js["properties"]["comments"].last["user"]
get :show, :id => open_note_with_comment.id, :format => "json"
assert_response :gone
end
def test_destroy_fail
+ user = create(:user)
+ moderator_user = create(:moderator_user)
+
delete :destroy, :id => 12345, :format => "json"
assert_response :unauthorized
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(user.email, "test")
delete :destroy, :id => 12345, :format => "json"
assert_response :forbidden
- basic_authorization(users(:moderator_user).email, "test")
+ basic_authorization(moderator_user.email, "test")
delete :destroy, :id => 12345, :format => "json"
assert_response :not_found
- hidden_note_with_comment = create(:note, :status => "hidden")
- create(:note_comment, :note => hidden_note_with_comment)
+ hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
+
delete :destroy, :id => hidden_note_with_comment.id, :format => "json"
assert_response :gone
end
def test_index_success
position = (1.1 * GeoRecord::SCALE).to_i
- note = create(:note, :latitude => position, :longitude => position)
- note2 = create(:note, :latitude => position, :longitude => position)
- create(:note_comment, :note => note)
- create(:note_comment, :note => note2)
+ create(:note_with_comments, :latitude => position, :longitude => position)
+ create(:note_with_comments, :latitude => position, :longitude => position)
get :index, :bbox => "1,1,1.2,1.2", :format => "rss"
assert_response :success
def test_index_limit
position = (1.1 * GeoRecord::SCALE).to_i
- note = create(:note, :latitude => position, :longitude => position)
- note2 = create(:note, :latitude => position, :longitude => position)
- create(:note_comment, :note => note)
- create(:note_comment, :note => note2)
+ create(:note_with_comments, :latitude => position, :longitude => position)
+ create(:note_with_comments, :latitude => position, :longitude => position)
get :index, :bbox => "1,1,1.2,1.2", :limit => 1, :format => "rss"
assert_response :success
end
def test_index_closed
- old_closed_note = create(:note, :status => "closed", :closed_at => Time.now - 5.days)
- very_old_closed_note = create(:note, :status => "closed", :closed_at => Time.now - 100.days)
- hidden_note = create(:note, :status => "hidden")
- open_note = create(:note)
- create(:note_comment, :note => old_closed_note)
- create(:note_comment, :note => very_old_closed_note)
- create(:note_comment, :note => hidden_note)
- create(:note_comment, :note => open_note)
+ create(:note_with_comments, :status => "closed", :closed_at => Time.now - 5.days)
+ create(:note_with_comments, :status => "closed", :closed_at => Time.now - 100.days)
+ create(:note_with_comments, :status => "hidden")
+ create(:note_with_comments)
# Open notes + closed in last 7 days
get :index, :bbox => "1,1,1.7,1.7", :closed => "7", :format => "json"
end
def test_search_success
- note = create(:note)
- create(:note_comment, :note => note, :body => "comment for note 1")
+ create(:note_with_comments)
- get :search, :q => "note 1", :format => "xml"
+ get :search, :q => "note comment", :format => "xml"
assert_response :success
assert_equal "application/xml", @response.content_type
assert_select "osm", :count => 1 do
assert_select "note", :count => 1
end
- get :search, :q => "note 1", :format => "json"
+ get :search, :q => "note comment", :format => "json"
assert_response :success
assert_equal "application/json", @response.content_type
js = ActiveSupport::JSON.decode(@response.body)
assert_equal "FeatureCollection", js["type"]
assert_equal 1, js["features"].count
- get :search, :q => "note 1", :format => "rss"
+ get :search, :q => "note comment", :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
end
end
- get :search, :q => "note 1", :format => "gpx"
+ get :search, :q => "note comment", :format => "gpx"
assert_response :success
assert_equal "application/gpx+xml", @response.content_type
assert_select "gpx", :count => 1 do
end
def test_search_no_match
- note = create(:note)
- create(:note_comment, :note => note, :body => "comment for node 1")
+ create(:note_with_comments)
get :search, :q => "no match", :format => "xml"
assert_response :success
def test_feed_success
position = (1.1 * GeoRecord::SCALE).to_i
- note = create(:note, :latitude => position, :longitude => position)
- note2 = create(:note, :latitude => position, :longitude => position)
- create(:note_comment, :note => note)
- create(:note_comment, :note => note2)
+ create(:note_with_comments, :latitude => position, :longitude => position)
+ create(:note_with_comments, :latitude => position, :longitude => position)
position = (1.5 * GeoRecord::SCALE).to_i
- note3 = create(:note, :latitude => position, :longitude => position)
- note4 = create(:note, :latitude => position, :longitude => position)
- create(:note_comment, :note => note3)
- create(:note_comment, :note => note4)
+ create(:note_with_comments, :latitude => position, :longitude => position)
+ create(:note_with_comments, :latitude => position, :longitude => position)
get :feed, :format => "rss"
assert_response :success
end
def test_mine_success
- note = create(:note)
- create(:note_comment, :note => note, :author_id => users(:normal_user).id)
- note2 = create(:note)
- create(:note_comment, :note => note2, :author_id => users(:second_public_user).id)
- hidden_note = create(:note, :status => "hidden")
- create(:note_comment, :note => hidden_note, :author_id => users(:second_public_user).id)
+ first_user = create(:user)
+ second_user = create(:user)
+ moderator_user = create(:moderator_user)
+
+ create(:note) do |note|
+ create(:note_comment, :note => note, :author => first_user)
+ end
+ create(:note) do |note|
+ create(:note_comment, :note => note, :author => second_user)
+ end
+ create(:note, :status => "hidden") do |note|
+ create(:note_comment, :note => note, :author => second_user)
+ end
# Note that the table rows include a header row
- get :mine, :display_name => "test"
+ get :mine, :display_name => first_user.display_name
assert_response :success
assert_select "table.note_list tr", :count => 2
- get :mine, :display_name => "pulibc_test2"
+ get :mine, :display_name => second_user.display_name
assert_response :success
assert_select "table.note_list tr", :count => 2
get :mine, :display_name => "non-existent"
assert_response :not_found
- session[:user] = users(:moderator_user).id
+ session[:user] = moderator_user.id
- get :mine, :display_name => "test"
+ get :mine, :display_name => first_user.display_name
assert_response :success
assert_select "table.note_list tr", :count => 2
- get :mine, :display_name => "pulibc_test2"
+ get :mine, :display_name => second_user.display_name
assert_response :success
assert_select "table.note_list tr", :count => 3
projects / rails.git / blobdiff