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

Merge remote-tracking branch 'openstreetmap/pull/1312'

Browse source
This commit is contained in:
Tom Hughes 2016-10-10 13:48:09 +01:00
commit 3123822bba
11 changed files with 227 additions and 371 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/notes_controller.rb
View file

@ -316,7 +316,7 @@ class NotesController < ApplicationController
end
##
# Generate a condition to choose which bugs we want based
# Generate a condition to choose which notes we want based
# on their status and the user's request parameters
def closed_condition(notes)
closed_since = if params[:closed]

23
test/controllers/browse_controller_test.rb
View file

@ -85,32 +85,43 @@ class BrowseControllerTest < ActionController::TestCase
end
def test_read_note
browse_check "note", notes(:open_note).id, "browse/note"
open_note = create(:note)
create(:note_comment, :note => open_note)
browse_check "note", open_note.id, "browse/note"
end
def test_read_hidden_note
get :note, :id => notes(:hidden_note_with_comment).id
hidden_note_with_comment = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note_with_comment)
get :note, :id => hidden_note_with_comment.id
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "map"
xhr :get, :note, :id => notes(:hidden_note_with_comment).id
xhr :get, :note, :id => hidden_note_with_comment.id
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "xhr"
session[:user] = users(:moderator_user).id
browse_check "note", notes(:hidden_note_with_comment).id, "browse/note"
browse_check "note", hidden_note_with_comment.id, "browse/note"
end
def test_read_note_hidden_comments
browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
note_with_hidden_comment = create(:note)
create(:note_comment, :note => note_with_hidden_comment)
create(:note_comment, :note => note_with_hidden_comment)
create(:note_comment, :note => note_with_hidden_comment, :visible => false)
browse_check "note", note_with_hidden_comment.id, "browse/note"
assert_select "div.note-comments ul li", :count => 1
session[:user] = users(:moderator_user).id
browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
browse_check "note", note_with_hidden_comment.id, "browse/note"
assert_select "div.note-comments ul li", :count => 2
end

256
test/controllers/notes_controller_test.rb
View file

@ -1,7 +1,7 @@
require "test_helper"
class NotesControllerTest < ActionController::TestCase
fixtures :users, :user_roles, :notes, :note_comments
fixtures :users, :user_roles
##
# test all routes which lead to this controller
@ -214,44 +214,50 @@ class NotesControllerTest < ActionController::TestCase
end
def test_comment_success
open_note_with_comment = create(:note)
create(:note_comment, :note => open_note_with_comment)
assert_difference "NoteComment.count", 1 do
assert_no_difference "ActionMailer::Base.deliveries.size" do
post :comment, :id => notes(:open_note_with_comment).id, :text => "This is an additional comment", :format => "json"
post :comment, :id => open_note_with_comment.id, :text => "This is an additional comment", :format => "json"
end
end
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal open_note_with_comment.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 5, js["properties"]["comments"].count
assert_equal 2, 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_nil js["properties"]["comments"].last["user"]
get :show, :id => notes(:open_note_with_comment).id, :format => "json"
get :show, :id => open_note_with_comment.id, :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal open_note_with_comment.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 5, js["properties"]["comments"].count
assert_equal 2, 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_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)
assert_difference "NoteComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
post :comment, :id => notes(:note_with_comments_by_users).id, :text => "This is an additional comment", :format => "json"
post :comment, :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json"
end
end
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:note_with_comments_by_users).id, js["properties"]["id"]
assert_equal note_with_comments_by_users.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
@ -268,12 +274,12 @@ class NotesControllerTest < ActionController::TestCase
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] An anonymous user has commented on a note you are interested in", email.subject
get :show, :id => notes(:note_with_comments_by_users).id, :format => "json"
get :show, :id => note_with_comments_by_users.id, :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:note_with_comments_by_users).id, js["properties"]["id"]
assert_equal note_with_comments_by_users.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 3, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
@ -286,14 +292,14 @@ class NotesControllerTest < ActionController::TestCase
assert_difference "NoteComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
post :comment, :id => notes(:note_with_comments_by_users).id, :text => "This is an additional comment", :format => "json"
post :comment, :id => note_with_comments_by_users.id, :text => "This is an additional comment", :format => "json"
end
end
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:note_with_comments_by_users).id, js["properties"]["id"]
assert_equal note_with_comments_by_users.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 4, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
@ -311,12 +317,12 @@ class NotesControllerTest < ActionController::TestCase
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] test2 has commented on a note you are interested in", email.subject
get :show, :id => notes(:note_with_comments_by_users).id, :format => "json"
get :show, :id => note_with_comments_by_users.id, :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:note_with_comments_by_users).id, js["properties"]["id"]
assert_equal note_with_comments_by_users.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 4, js["properties"]["comments"].count
assert_equal "commented", js["properties"]["comments"].last["action"]
@ -327,18 +333,19 @@ class NotesControllerTest < ActionController::TestCase
end
def test_comment_fail
open_note_with_comment = create(:note_comment).note
assert_no_difference "NoteComment.count" do
post :comment, :text => "This is an additional comment"
end
assert_response :bad_request
assert_no_difference "NoteComment.count" do
post :comment, :id => notes(:open_note_with_comment).id
post :comment, :id => open_note_with_comment.id
end
assert_response :bad_request
assert_no_difference "NoteComment.count" do
post :comment, :id => notes(:open_note_with_comment).id, :text => ""
post :comment, :id => open_note_with_comment.id, :text => ""
end
assert_response :bad_request
@ -347,43 +354,49 @@ class NotesControllerTest < ActionController::TestCase
end
assert_response :not_found
hidden_note_with_comment = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note_with_comment)
assert_no_difference "NoteComment.count" do
post :comment, :id => notes(:hidden_note_with_comment).id, :text => "This is an additional comment"
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)
assert_no_difference "NoteComment.count" do
post :comment, :id => notes(:closed_note_with_comment).id, :text => "This is an additional comment"
post :comment, :id => closed_note_with_comment.id, :text => "This is an additional comment"
end
assert_response :conflict
end
def test_close_success
post :close, :id => notes(:open_note_with_comment).id, :text => "This is a close comment", :format => "json"
open_note_with_comment = create(:note)
create(:note_comment, :note => open_note_with_comment)
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")
post :close, :id => notes(:open_note_with_comment).id, :text => "This is a close comment", :format => "json"
post :close, :id => open_note_with_comment.id, :text => "This is a close comment", :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal open_note_with_comment.id, js["properties"]["id"]
assert_equal "closed", js["properties"]["status"]
assert_equal 5, js["properties"]["comments"].count
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"]
get :show, :id => notes(:open_note_with_comment).id, :format => "json"
get :show, :id => open_note_with_comment.id, :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal open_note_with_comment.id, js["properties"]["id"]
assert_equal "closed", js["properties"]["status"]
assert_equal 5, js["properties"]["comments"].count
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"]
@ -401,37 +414,42 @@ class NotesControllerTest < ActionController::TestCase
post :close, :id => 12345
assert_response :not_found
post :close, :id => notes(:hidden_note_with_comment).id
hidden_note_with_comment = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note_with_comment)
post :close, :id => hidden_note_with_comment.id
assert_response :gone
post :close, :id => notes(:closed_note_with_comment).id
closed_note_with_comment = create(:note, :status => "closed", :closed_at => Time.now)
post :close, :id => closed_note_with_comment.id
assert_response :conflict
end
def test_reopen_success
post :reopen, :id => notes(:closed_note_with_comment).id, :text => "This is a reopen comment", :format => "json"
closed_note_with_comment = create(:note, :status => "closed", :closed_at => Time.now)
create(:note_comment, :note => closed_note_with_comment)
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")
post :reopen, :id => notes(:closed_note_with_comment).id, :text => "This is a reopen comment", :format => "json"
post :reopen, :id => closed_note_with_comment.id, :text => "This is a reopen comment", :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:closed_note_with_comment).id, js["properties"]["id"]
assert_equal closed_note_with_comment.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
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"]
get :show, :id => notes(:closed_note_with_comment).id, :format => "json"
get :show, :id => closed_note_with_comment.id, :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:closed_note_with_comment).id, js["properties"]["id"]
assert_equal closed_note_with_comment.id, js["properties"]["id"]
assert_equal "open", js["properties"]["status"]
assert_equal 2, js["properties"]["comments"].count
assert_equal "reopened", js["properties"]["comments"].last["action"]
@ -440,7 +458,9 @@ class NotesControllerTest < ActionController::TestCase
end
def test_reopen_fail
post :reopen, :id => notes(:hidden_note_with_comment).id
hidden_note_with_comment = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note_with_comment)
post :reopen, :id => hidden_note_with_comment.id
assert_response :unauthorized
basic_authorization(users(:public_user).email, "test")
@ -448,126 +468,137 @@ class NotesControllerTest < ActionController::TestCase
post :reopen, :id => 12345
assert_response :not_found
post :reopen, :id => notes(:hidden_note_with_comment).id
post :reopen, :id => hidden_note_with_comment.id
assert_response :gone
post :reopen, :id => notes(:open_note_with_comment).id
open_note_with_comment = create(:note)
create(:note_comment, :note => open_note_with_comment)
post :reopen, :id => open_note_with_comment.id
assert_response :conflict
end
def test_show_success
get :show, :id => notes(:open_note).id, :format => "xml"
open_note = create(:note)
create(:note_comment, :note => open_note)
get :show, :id => open_note.id, :format => "xml"
assert_response :success
assert_equal "application/xml", @response.content_type
assert_select "osm", :count => 1 do
assert_select "note[lat='#{notes(:open_note).lat}'][lon='#{notes(:open_note).lon}']", :count => 1 do
assert_select "id", notes(:open_note).id
assert_select "url", note_url(notes(:open_note), :format => "xml")
assert_select "comment_url", comment_note_url(notes(:open_note), :format => "xml")
assert_select "close_url", close_note_url(notes(:open_note), :format => "xml")
assert_select "date_created", notes(:open_note).created_at.to_s
assert_select "status", notes(:open_note).status
assert_select "note[lat='#{open_note.lat}'][lon='#{open_note.lon}']", :count => 1 do
assert_select "id", open_note.id.to_s
assert_select "url", note_url(open_note, :format => "xml")
assert_select "comment_url", comment_note_url(open_note, :format => "xml")
assert_select "close_url", close_note_url(open_note, :format => "xml")
assert_select "date_created", open_note.created_at.to_s
assert_select "status", open_note.status
assert_select "comments", :count => 1 do
assert_select "comment", :count => 1
end
end
end
get :show, :id => notes(:open_note).id, :format => "rss"
get :show, :id => open_note.id, :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
assert_select "channel", :count => 1 do
assert_select "item", :count => 1 do
assert_select "link", browse_note_url(notes(:open_note))
assert_select "guid", note_url(notes(:open_note))
assert_select "pubDate", notes(:open_note).created_at.to_s(:rfc822)
# assert_select "geo:lat", notes(:open_note).lat.to_s
# assert_select "geo:long", notes(:open_note).lon
# assert_select "georss:point", "#{notes(:open_note).lon} #{notes(:open_note).lon}"
assert_select "link", browse_note_url(open_note)
assert_select "guid", note_url(open_note)
assert_select "pubDate", open_note.created_at.to_s(:rfc822)
# assert_select "geo:lat", open_note.lat.to_s
# assert_select "geo:long", open_note.lon
# assert_select "georss:point", "#{open_note.lon} #{open_note.lon}"
end
end
end
get :show, :id => notes(:open_note).id, :format => "json"
get :show, :id => open_note.id, :format => "json"
assert_response :success
assert_equal "application/json", @response.content_type
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal "Point", js["geometry"]["type"]
assert_equal notes(:open_note).lat, js["geometry"]["coordinates"][0]
assert_equal notes(:open_note).lon, js["geometry"]["coordinates"][1]
assert_equal notes(:open_note).id, js["properties"]["id"]
assert_equal note_url(notes(:open_note), :format => "json"), js["properties"]["url"]
assert_equal comment_note_url(notes(:open_note), :format => "json"), js["properties"]["comment_url"]
assert_equal close_note_url(notes(:open_note), :format => "json"), js["properties"]["close_url"]
assert_equal notes(:open_note).created_at, js["properties"]["date_created"]
assert_equal notes(:open_note).status, js["properties"]["status"]
assert_equal open_note.lat, js["geometry"]["coordinates"][0]
assert_equal open_note.lon, js["geometry"]["coordinates"][1]
assert_equal open_note.id, js["properties"]["id"]
assert_equal note_url(open_note, :format => "json"), js["properties"]["url"]
assert_equal comment_note_url(open_note, :format => "json"), js["properties"]["comment_url"]
assert_equal close_note_url(open_note, :format => "json"), js["properties"]["close_url"]
assert_equal open_note.created_at.to_s, js["properties"]["date_created"]
assert_equal open_note.status, js["properties"]["status"]
get :show, :id => notes(:open_note).id, :format => "gpx"
get :show, :id => open_note.id, :format => "gpx"
assert_response :success
assert_equal "application/gpx+xml", @response.content_type
assert_select "gpx", :count => 1 do
assert_select "wpt[lat='#{notes(:open_note).lat}'][lon='#{notes(:open_note).lon}']", :count => 1 do
assert_select "wpt[lat='#{open_note.lat}'][lon='#{open_note.lon}']", :count => 1 do
assert_select "time", :count => 1
assert_select "name", "Note: #{notes(:open_note).id}"
assert_select "name", "Note: #{open_note.id}"
assert_select "desc", :count => 1
assert_select "link[href='http://www.openstreetmap.org/note/#{notes(:open_note).id}']", :count => 1
assert_select "link[href='http://www.openstreetmap.org/note/#{open_note.id}']", :count => 1
assert_select "extensions", :count => 1 do
assert_select "id", notes(:open_note).id
assert_select "url", note_url(notes(:open_note), :format => "gpx")
assert_select "comment_url", comment_note_url(notes(:open_note), :format => "gpx")
assert_select "close_url", close_note_url(notes(:open_note), :format => "gpx")
assert_select "id", open_note.id.to_s
assert_select "url", note_url(open_note, :format => "gpx")
assert_select "comment_url", comment_note_url(open_note, :format => "gpx")
assert_select "close_url", close_note_url(open_note, :format => "gpx")
end
end
end
end
def test_show_hidden_comment
get :show, :id => notes(:note_with_hidden_comment).id, :format => "json"
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")
get :show, :id => note_with_hidden_comment.id, :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:note_with_hidden_comment).id, js["properties"]["id"]
assert_equal note_with_hidden_comment.id, js["properties"]["id"]
assert_equal 2, js["properties"]["comments"].count
assert_equal "Valid comment for note 5", js["properties"]["comments"][0]["text"]
assert_equal "Another valid comment for note 5", js["properties"]["comments"][1]["text"]
assert_equal "Valid comment for hidden note", js["properties"]["comments"][0]["text"]
assert_equal "Another valid comment for hidden note", js["properties"]["comments"][1]["text"]
end
def test_show_fail
get :show, :id => 12345
assert_response :not_found
get :show, :id => notes(:hidden_note_with_comment).id
get :show, :id => create(:note, :status => "hidden").id
assert_response :gone
end
def test_destroy_success
delete :destroy, :id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"
open_note_with_comment = create(:note)
create(:note_comment, :note => open_note_with_comment)
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")
delete :destroy, :id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"
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")
delete :destroy, :id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"
delete :destroy, :id => open_note_with_comment.id, :text => "This is a hide comment", :format => "json"
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "Feature", js["type"]
assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
assert_equal open_note_with_comment.id, js["properties"]["id"]
assert_equal "hidden", js["properties"]["status"]
assert_equal 5, js["properties"]["comments"].count
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"]
get :show, :id => notes(:open_note_with_comment).id, :format => "json"
get :show, :id => open_note_with_comment.id, :format => "json"
assert_response :gone
end
@ -585,11 +616,19 @@ class NotesControllerTest < ActionController::TestCase
delete :destroy, :id => 12345, :format => "json"
assert_response :not_found
delete :destroy, :id => notes(:hidden_note_with_comment).id, :format => "json"
hidden_note_with_comment = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note_with_comment)
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)
get :index, :bbox => "1,1,1.2,1.2", :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
@ -623,6 +662,12 @@ class NotesControllerTest < ActionController::TestCase
end
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)
get :index, :bbox => "1,1,1.2,1.2", :limit => 1, :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
@ -707,29 +752,41 @@ class NotesControllerTest < ActionController::TestCase
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)
# Open notes + closed in last 7 days
get :index, :bbox => "1,1,1.7,1.7", :closed => "7", :format => "json"
assert_response :success
assert_equal "application/json", @response.content_type
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "FeatureCollection", js["type"]
assert_equal 4, js["features"].count
assert_equal 2, js["features"].count
# Only open notes
get :index, :bbox => "1,1,1.7,1.7", :closed => "0", :format => "json"
assert_response :success
assert_equal "application/json", @response.content_type
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "FeatureCollection", js["type"]
assert_equal 4, js["features"].count
assert_equal 1, js["features"].count
# Open notes + all closed notes
get :index, :bbox => "1,1,1.7,1.7", :closed => "-1", :format => "json"
assert_response :success
assert_equal "application/json", @response.content_type
js = ActiveSupport::JSON.decode(@response.body)
assert_not_nil js
assert_equal "FeatureCollection", js["type"]
assert_equal 6, js["features"].count
assert_equal 3, js["features"].count
end
def test_index_bad_params
@ -759,6 +816,9 @@ class NotesControllerTest < ActionController::TestCase
end
def test_search_success
note = create(:note)
create(:note_comment, :note => note, :body => "comment for note 1")
get :search, :q => "note 1", :format => "xml"
assert_response :success
assert_equal "application/xml", @response.content_type
@ -792,6 +852,9 @@ class NotesControllerTest < ActionController::TestCase
end
def test_search_no_match
note = create(:note)
create(:note_comment, :note => note, :body => "comment for node 1")
get :search, :q => "no match", :format => "xml"
assert_response :success
assert_equal "application/xml", @response.content_type
@ -836,12 +899,23 @@ class NotesControllerTest < ActionController::TestCase
end
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)
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)
get :feed, :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
assert_select "channel", :count => 1 do
assert_select "item", :count => 10
assert_select "item", :count => 4
end
end
@ -850,7 +924,7 @@ class NotesControllerTest < ActionController::TestCase
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
assert_select "channel", :count => 1 do
assert_select "item", :count => 5
assert_select "item", :count => 2
end
end
end
@ -870,13 +944,21 @@ class NotesControllerTest < ActionController::TestCase
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)
# Note that the table rows include a header row
get :mine, :display_name => "test"
assert_response :success
assert_select "table.note_list tr", :count => 2
get :mine, :display_name => "pulibc_test2"
assert_response :success
assert_select "table.note_list tr", :count => 3
assert_select "table.note_list tr", :count => 2
get :mine, :display_name => "non-existent"
assert_response :not_found
@ -889,7 +971,7 @@ class NotesControllerTest < ActionController::TestCase
get :mine, :display_name => "pulibc_test2"
assert_response :success
assert_select "table.note_list tr", :count => 4
assert_select "table.note_list tr", :count => 3
get :mine, :display_name => "non-existent"
assert_response :not_found

3
test/controllers/site_controller_test.rb
View file

@ -265,7 +265,8 @@ class SiteControllerTest < ActionController::TestCase
# Test editing a specific note
def test_edit_with_note
user = users(:public_user)
note = notes(:open_note)
note = create(:note)
create(:note_comment, :author_id => user.id)
get :edit, { :note => note.id }, { :user => user.id }
assert_response :success

8
test/factories/note_comments.rb Normal file
View file

@ -0,0 +1,8 @@
FactoryGirl.define do
factory :note_comment do
sequence(:body) { |n| "This is note comment #{n}" }
visible true
event "opened"
note
end
end

7
test/factories/notes.rb Normal file
View file

@ -0,0 +1,7 @@
FactoryGirl.define do
factory :note do
latitude 1 * GeoRecord::SCALE
longitude 1 * GeoRecord::SCALE
# tile QuadTile.tile_for_point(1,1)
end
end

142
test/fixtures/note_comments.yml vendored
View file

@ -1,142 +0,0 @@
t1:
id: 1
note_id: 1
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_ip: '192.168.1.1'
body: 'This is the initial description of the note 1'
t2:
id: 2
note_id: 2
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_ip: '192.168.1.1'
body: 'This is the initial description of the note 2'
t3:
id: 3
note_id: 2
visible: true
event: opened
created_at: 2007-02-01 00:00:00
author_ip: '192.168.1.1'
body: 'This is an additional comment for note 2'
t4:
id: 4
note_id: 3
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_ip: '192.168.1.1'
body: 'This is the initial comment for note 3'
t5:
id: 5
note_id: 4
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_ip: '192.168.1.1'
body: 'Spam for note 4'
t6:
id: 6
note_id: 5
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_ip: '192.168.1.1'
body: 'Valid comment for note 5'
t7:
id: 7
note_id: 5
visible: false
event: commented
created_at: 2007-02-01 00:00:00
author_ip: '192.168.1.1'
body: 'Spam for note 5'
t8:
id: 8
note_id: 5
visible: true
event: commented
created_at: 2007-02-01 00:00:00
author_ip: '192.168.1.1'
body: 'Another valid comment for note 5'
t9:
id: 9
note_id: 6
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_id: 1
body: 'This is a note with from a logged-in user'
t10:
id: 10
note_id: 6
visible: true
event: commented
created_at: 2007-02-01 00:00:00
author_id: 4
body: 'A comment from another logged-in user'
t11:
id: 11
note_id: 7
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_ip: '192.168.1.1'
body: 'Initial note description'
t12:
id: 12
note_id: 7
visible: true
event: commented
created_at: 2007-02-01 00:00:00
author_ip: '192.168.1.1'
body: 'A comment description'
t13:
id: 13
note_id: 7
visible: true
event: closed
created_at: 2007-03-01 00:00:00
author_id: 4
t14:
id: 14
note_id: 8
visible: true
event: commented
created_at: 2007-02-01 00:00:00
author_id: 4
body: 'A comment description'
t15:
id: 15
note_id: 2
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_id: 10
body: 'This is a note with from a suspended user'
t16:
id: 16
note_id: 2
visible: true
event: opened
created_at: 2007-01-01 00:00:00
author_id: 11
body: 'This is a note with from a deleted user'

113
test/fixtures/notes.yml vendored
View file

@ -1,113 +0,0 @@
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
<% SCALE = 10000000 unless defined?(SCALE) %>
open_note:
id: 1
latitude: <%= 1*SCALE %>
longitude: <%= 1*SCALE %>
status: open
tile: <%= QuadTile.tile_for_point(1,1) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-01-01 00:00:00
open_note_with_comment:
id: 2
latitude: <%= 1.1*SCALE %>
longitude: <%= 1.1*SCALE %>
status: open
tile: <%= QuadTile.tile_for_point(1.1,1.1) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-02-01 00:00:00
closed_note_with_comment:
id: 3
latitude: <%= 1.2*SCALE %>
longitude: <%= 1.2*SCALE %>
status: closed
tile: <%= QuadTile.tile_for_point(1.2,1.2) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
closed_at: 2007-03-01 00:00:00
hidden_note_with_comment:
id: 4
latitude: <%= 1.3*SCALE %>
longitude: <%= 1.3*SCALE %>
status: hidden
tile: <%= QuadTile.tile_for_point(1.3,1.3) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
note_with_hidden_comment:
id: 5
latitude: <%= 1.4*SCALE %>
longitude: <%= 1.4*SCALE %>
status: open
tile: <%= QuadTile.tile_for_point(1.4,1.4) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
note_with_comments_by_users:
id: 6
latitude: <%= 1.5*SCALE %>
longitude: <%= 1.5*SCALE %>
status: open
tile: <%= QuadTile.tile_for_point(1.5,1.5) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
note_closed_by_user:
id: 7
latitude: <%= 1.6*SCALE %>
longitude: <%= 1.6*SCALE %>
status: closed
tile: <%= QuadTile.tile_for_point(1.6,1.6) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
closed_at: 2007-03-01 00:00:00
hidden_note_with_comment:
id: 4
latitude: <%= 1.3*SCALE %>
longitude: <%= 1.3*SCALE %>
status: hidden
tile: <%= QuadTile.tile_for_point(1.3,1.3) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
note_with_hidden_comment:
id: 5
latitude: <%= 1.4*SCALE %>
longitude: <%= 1.4*SCALE %>
status: open
tile: <%= QuadTile.tile_for_point(1.4,1.4) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
note_with_comments_by_users:
id: 6
latitude: <%= 1.5*SCALE %>
longitude: <%= 1.5*SCALE %>
status: open
tile: <%= QuadTile.tile_for_point(1.5,1.5) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
note_closed_by_user:
id: 7
latitude: <%= 1.6*SCALE %>
longitude: <%= 1.6*SCALE %>
status: closed
tile: <%= QuadTile.tile_for_point(1.6,1.6) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00
closed_at: 2007-03-01 00:00:00
hidden_note_with_comment_by_user:
id: 8
latitude: <%= 1.3*SCALE %>
longitude: <%= 1.3*SCALE %>
status: hidden
tile: <%= QuadTile.tile_for_point(1.3,1.3) %>
created_at: 2007-01-01 00:00:00
updated_at: 2007-03-01 00:00:00

10
test/models/note_comment_test.rb
View file

@ -2,20 +2,20 @@
require "test_helper"
class NoteCommentTest < ActiveSupport::TestCase
fixtures :users, :notes, :note_comments
fixtures :users
def test_event_valid
ok = %w(opened closed reopened commented hidden)
bad = %w(expropriated fubared)
ok.each do |event|
note_comment = note_comments(:t1)
note_comment = create(:note_comment)
note_comment.event = event
assert note_comment.valid?, "#{event} is invalid, when it should be"
end
bad.each do |event|
note_comment = note_comments(:t1)
note_comment = create(:note_comment)
note_comment.event = event
assert !note_comment.valid?, "#{event} is valid when it shouldn't be"
end
@ -28,13 +28,13 @@ class NoteCommentTest < ActiveSupport::TestCase
"foo\ufffebar", "foo\uffffbar"]
ok.each do |body|
note_comment = note_comments(:t1)
note_comment = create(:note_comment)
note_comment.body = body
assert note_comment.valid?, "#{body} is invalid, when it should be"
end
bad.each do |body|
note_comment = note_comments(:t1)
note_comment = create(:note_comment)
note_comment.body = body
assert !note_comment.valid?, "#{body} is valid when it shouldn't be"
end

32
test/models/note_test.rb
View file

@ -2,27 +2,27 @@
require "test_helper"
class NoteTest < ActiveSupport::TestCase
fixtures :users, :notes, :note_comments
fixtures :users
def test_status_valid
ok = %w(open closed hidden)
bad = %w(expropriated fubared)
ok.each do |status|
note = notes(:open_note)
note = create(:note)
note.status = status
assert note.valid?, "#{status} is invalid, when it should be"
end
bad.each do |status|
note = notes(:open_note)
note = create(:note)
note.status = status
assert !note.valid?, "#{status} is valid when it shouldn't be"
end
end
def test_close
note = notes(:open_note)
note = create(:note)
assert_equal "open", note.status
assert_nil note.closed_at
note.close
@ -31,7 +31,7 @@ class NoteTest < ActiveSupport::TestCase
end
def test_reopen
note = notes(:closed_note_with_comment)
note = create(:note, :status => "closed", :closed_at => Time.now)
assert_equal "closed", note.status
assert_not_nil note.closed_at
note.reopen
@ -40,23 +40,27 @@ class NoteTest < ActiveSupport::TestCase
end
def test_visible?
assert_equal true, notes(:open_note).visible?
assert_equal true, notes(:note_with_hidden_comment).visible?
assert_equal false, notes(:hidden_note_with_comment).visible?
assert_equal true, create(:note, :status => "open").visible?
assert_equal true, create(:note, :status => "closed").visible?
assert_equal false, create(:note, :status => "hidden").visible?
end
def test_closed?
assert_equal true, notes(:closed_note_with_comment).closed?
assert_equal false, notes(:open_note).closed?
assert_equal true, create(:note, :status => "closed", :closed_at => Time.now).closed?
assert_equal false, create(:note, :status => "open", :closed_at => nil).closed?
end
def test_author
assert_nil notes(:open_note).author
assert_equal users(:normal_user), notes(:note_with_comments_by_users).author
anonymous_comment = create(:note_comment)
assert_nil anonymous_comment.note.author
comment = create(:note_comment, :author_id => users(:normal_user).id)
assert_equal users(:normal_user), comment.note.author
end
def test_author_ip
assert_equal IPAddr.new("192.168.1.1"), notes(:open_note).author_ip
assert_nil notes(:note_with_comments_by_users).author_ip
comment = create(:note_comment, :author_ip => IPAddr.new("192.168.1.1"))
assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip
comment = create(:note_comment, :author_ip => nil)
assert_nil comment.note.author_ip
end
end

2
test/test_helper.rb
View file

@ -60,8 +60,6 @@ module ActiveSupport
fixtures :client_applications
fixtures :redactions
fixtures :notes, :note_comments
end
##