X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dfc85f089abc60ad1bd481de670413fa509dc36c..b170c06d5cd77d15d36105e6530ec99eb7e390e9:/test/controllers/changeset_controller_test.rb
diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 6a443850f..ca2ff8e15 100644
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -3,7 +3,6 @@ require "changeset_controller"
class ChangesetControllerTest < ActionController::TestCase
api_fixtures
- fixtures :changeset_comments, :changesets_subscribers
##
# test all routes which lead to this controller
@@ -74,11 +73,11 @@ class ChangesetControllerTest < ActionController::TestCase
)
assert_routing(
{ :path => "/history/friends", :method => :get },
- { :controller => "changeset", :action => "list", :friends => true }
+ { :controller => "changeset", :action => "list", :friends => true, :format => :html }
)
assert_routing(
{ :path => "/history/nearby", :method => :get },
- { :controller => "changeset", :action => "list", :nearby => true }
+ { :controller => "changeset", :action => "list", :nearby => true, :format => :html }
)
assert_routing(
{ :path => "/history", :method => :get },
@@ -102,16 +101,16 @@ class ChangesetControllerTest < ActionController::TestCase
basic_authorization users(:normal_user).email, "test"
# Create the first user's changeset
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_require_public_data
basic_authorization users(:public_user).email, "test"
# Create the first user's changeset
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :success, "Creation of changeset did not return sucess status"
@@ -197,6 +196,7 @@ class ChangesetControllerTest < ActionController::TestCase
assert_select "osm>changeset>discussion>comment", 0
changeset_id = changesets(:normal_user_closed_change).id
+ create_list(:changeset_comment, 3, :changeset_id => changeset_id)
get :read, :id => changeset_id, :include_discussion => true
assert_response :success, "cannot get closed changeset with comments"
@@ -527,8 +527,8 @@ EOF
# create a temporary changeset
content "" +
- "" +
- ""
+ "" +
+ ""
assert_difference "Changeset.count", 1 do
put :create
end
@@ -582,9 +582,9 @@ EOF
# check that the changeset bbox is within bounds
cs = Changeset.find(changeset_id)
assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
- assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
- assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
- assert cs.max_lat >= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
+ assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
+ assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
+ assert cs.max_lat >= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
end
##
@@ -675,7 +675,7 @@ EOF
-
+
@@ -1102,8 +1102,8 @@ EOF
basic_authorization users(:public_user).email, "test"
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :success
changeset_id = @response.body.to_i
@@ -1114,8 +1114,8 @@ EOF
diff.root = XML::Node.new "osmChange"
modify = XML::Node.new "modify"
xml_old_node = old_node.to_xml_node
- xml_old_node["lat"] = (2.0).to_s
- xml_old_node["lon"] = (2.0).to_s
+ xml_old_node["lat"] = 2.0.to_s
+ xml_old_node["lon"] = 2.0.to_s
xml_old_node["changeset"] = changeset_id.to_s
modify << xml_old_node
diff.root << modify
@@ -1140,8 +1140,8 @@ EOF
basic_authorization users(:public_user).email, "test"
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :success
changeset_id = @response.body.to_i
@@ -1181,8 +1181,7 @@ EOF
["",
"",
"",
- ""
- ].each do |diff|
+ ""].each do |diff|
# upload it
content diff
post :upload, :id => changesets(:public_user_first_change).id
@@ -1225,8 +1224,8 @@ EOF
# create a temporary changeset
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :forbidden
@@ -1235,8 +1234,8 @@ EOF
# create a temporary changeset
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :success
changeset_id = @response.body.to_i
@@ -1281,8 +1280,8 @@ EOF
# create a temporary changeset
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :success
changeset_id = @response.body.to_i
@@ -1340,8 +1339,8 @@ OSMFILE
# create a temporary changeset
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
assert_response :success
changeset_id = @response.body.to_i
@@ -1389,7 +1388,10 @@ EOF
end
def test_changeset_download
+ tag = create(:old_node_tag, :old_node => nodes(:used_node_2))
+
get :download, :id => changesets(:normal_user_first_change).id
+
assert_response :success
assert_template nil
# print @response.body
@@ -1397,7 +1399,7 @@ EOF
assert_select "osmChange[version='#{API_VERSION}'][generator='#{GENERATOR}']" do
assert_select "create", :count => 5
assert_select "create>node[id='#{nodes(:used_node_2).node_id}'][visible='#{nodes(:used_node_2).visible?}'][version='#{nodes(:used_node_2).version}']" do
- assert_select "tag[k='#{node_tags(:t3).k}'][v='#{node_tags(:t3).v}']"
+ assert_select "tag[k='#{tag.k}'][v='#{tag.v}']"
end
assert_select "create>node[id='#{nodes(:visible_node).node_id}']"
end
@@ -1477,12 +1479,12 @@ EOF
# NOTE: the include method doesn't over-expand, like inserting
# a real method does. this is because we expect the client to
# know what it is doing!
- check_after_include(changeset_id, 1, 1, [1, 1, 1, 1])
- check_after_include(changeset_id, 3, 3, [1, 1, 3, 3])
- check_after_include(changeset_id, 4, 2, [1, 1, 4, 3])
- check_after_include(changeset_id, 2, 2, [1, 1, 4, 3])
- check_after_include(changeset_id, -1, -1, [-1, -1, 4, 3])
- check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5])
+ check_after_include(changeset_id, 1, 1, [1, 1, 1, 1])
+ check_after_include(changeset_id, 3, 3, [1, 1, 3, 3])
+ check_after_include(changeset_id, 4, 2, [1, 1, 4, 3])
+ check_after_include(changeset_id, 2, 2, [1, 1, 4, 3])
+ check_after_include(changeset_id, -1, -1, [-1, -1, 4, 3])
+ check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5])
end
##
@@ -1574,7 +1576,7 @@ EOF
get :query, :closed => "true"
assert_response :success, "can't get changesets by closed-ness"
- assert_changesets [3, 5, 6, 7, 8]
+ assert_changesets [3, 5, 6, 7, 8, 9]
get :query, :closed => "true", :user => users(:normal_user).id
assert_response :success, "can't get changesets by closed-ness and user"
@@ -1598,8 +1600,7 @@ EOF
def test_query_invalid
["abracadabra!",
"1,2,3,F",
- ";drop table users;"
- ].each do |bbox|
+ ";drop table users;"].each do |bbox|
get :query, :bbox => bbox
assert_response :bad_request, "'#{bbox}' isn't a bbox"
end
@@ -1608,8 +1609,7 @@ EOF
"00-00-00",
";drop table users;",
",",
- "-,-"
- ].each do |time|
+ "-,-"].each do |time|
get :query, :time => time
assert_response :bad_request, "'#{time}' isn't a valid time range"
end
@@ -1617,8 +1617,7 @@ EOF
["me",
"foobar",
"-1",
- "0"
- ].each do |uid|
+ "0"].each do |uid|
get :query, :user => uid
assert_response :bad_request, "'#{uid}' isn't a valid user ID"
end
@@ -1652,6 +1651,7 @@ EOF
## Now try with the public user
changeset = changesets(:public_user_first_change)
+ create(:changeset_tag, :changeset => changeset)
new_changeset = changeset.to_xml
new_tag = XML::Node.new "tag"
new_tag["k"] = "tagtesting"
@@ -1760,7 +1760,7 @@ EOF
end
##
- # This should display the last 20 changesets closed.
+ # This should display the last 20 changesets closed
def test_list
get :list, :format => "html"
assert_response :success
@@ -1768,25 +1768,15 @@ EOF
assert_template :layout => "map"
assert_select "h2", :text => "Changesets", :count => 1
- get :list, :format => "html", :list => "1", :bbox => "-180,-90,90,180"
+ xhr :get, :list, :format => "html", :list => "1"
assert_response :success
assert_template "list"
- changesets = Changeset
- .where("num_changes > 0 and min_lon is not null")
- .order(:created_at => :desc)
- .limit(20)
- assert changesets.size <= 20
-
- # Now check that all 20 (or however many were returned) changesets are in the html
- assert_select "li", :count => changesets.size
- changesets.each do |_changeset|
- # FIXME: this test needs rewriting - test for table contents
- end
+ check_list_result(Changeset.all)
end
##
- # This should display the last 20 changesets closed.
+ # This should display the last 20 changesets closed
def test_list_xhr
xhr :get, :list, :format => "html"
assert_response :success
@@ -1794,31 +1784,59 @@ EOF
assert_template :layout => "xhr"
assert_select "h2", :text => "Changesets", :count => 1
- get :list, :format => "html", :list => "1", :bbox => "-180,-90,90,180"
+ xhr :get, :list, :format => "html", :list => "1"
assert_response :success
assert_template "list"
- changesets = Changeset
- .where("num_changes > 0 and min_lon is not null")
- .order(:created_at => :desc)
- .limit(20)
- assert changesets.size <= 20
+ check_list_result(Changeset.all)
+ end
- # Now check that all 20 (or however many were returned) changesets are in the html
- assert_select "li", :count => changesets.size
- changesets.each do |_changeset|
- # FIXME: this test needs rewriting - test for table contents
- end
+ ##
+ # This should display the last 20 changesets closed in a specific area
+ def test_list_bbox
+ get :list, :format => "html", :bbox => "4.5,4.5,5.5,5.5"
+ assert_response :success
+ assert_template "history"
+ assert_template :layout => "map"
+ assert_select "h2", :text => "Changesets", :count => 1
+
+ xhr :get, :list, :format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1"
+ assert_response :success
+ assert_template "list"
+
+ check_list_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000"))
end
##
# Checks the display of the user changesets listing
def test_list_user
user = users(:public_user)
+
get :list, :format => "html", :display_name => user.display_name
assert_response :success
assert_template "history"
- # FIXME: need to add more checks to see which if edits are actually shown if your data is public
+
+ xhr :get, :list, :format => "html", :display_name => user.display_name, :list => "1"
+ assert_response :success
+ assert_template "list"
+
+ check_list_result(user.changesets)
+ end
+
+ ##
+ # Checks the display of the user changesets listing for a private user
+ def test_list_private_user
+ user = users(:normal_user)
+
+ get :list, :format => "html", :display_name => user.display_name
+ assert_response :success
+ assert_template "history"
+
+ xhr :get, :list, :format => "html", :display_name => user.display_name, :list => "1"
+ assert_response :success
+ assert_template "list"
+
+ check_list_result(Changeset.none)
end
##
@@ -1827,33 +1845,105 @@ EOF
get :list, :format => "html", :display_name => "Some random user"
assert_response :not_found
assert_template "user/no_such_user"
+
+ xhr :get, :list, :format => "html", :display_name => "Some random user", :list => "1"
+ assert_response :not_found
+ assert_template "user/no_such_user"
end
##
- # This should display the last 20 changesets closed.
+ # Checks the display of the friends changesets listing
+ def test_list_friends
+ user = users(:normal_user)
+
+ get :list, :friends => true
+ assert_response :redirect
+ assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path
+
+ session[:user] = user.id
+
+ get :list, :friends => true
+ assert_response :success
+ assert_template "history"
+
+ xhr :get, :list, :friends => true, :list => "1"
+ assert_response :success
+ assert_template "list"
+
+ check_list_result(Changeset.where(:user => user.friend_users.identifiable))
+ end
+
+ ##
+ # Checks the display of the nearby user changesets listing
+ def test_list_nearby
+ user = users(:normal_user)
+
+ get :list, :nearby => true
+ assert_response :redirect
+ assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path
+
+ session[:user] = user.id
+
+ get :list, :nearby => true
+ assert_response :success
+ assert_template "history"
+
+ xhr :get, :list, :nearby => true, :list => "1"
+ assert_response :success
+ assert_template "list"
+
+ check_list_result(Changeset.where(:user => user.nearby))
+ end
+
+ ##
+ # Check that we can't request later pages of the changesets list
+ def test_list_max_id
+ xhr :get, :list, :format => "html", :max_id => 4
+ assert_response :success
+ assert_template "history"
+ assert_template :layout => "xhr"
+ assert_select "h2", :text => "Changesets", :count => 1
+
+ xhr :get, :list, :format => "html", :list => "1", :max_id => 4
+ assert_response :success
+ assert_template "list"
+
+ check_list_result(Changeset.where("id <= 4"))
+ end
+
+ ##
+ # This should display the last 20 changesets closed
def test_feed
- changesets = Changeset.where("num_changes > 0").order(:created_at => :desc).limit(20)
- assert changesets.size <= 20
- get :feed, :format => "atom"
+ get :feed, :format => :atom
assert_response :success
assert_template "list"
- # Now check that all 20 (or however many were returned) changesets are in the html
- assert_select "feed", :count => 1
- assert_select "entry", :count => changesets.size
- changesets.each do |_changeset|
- # FIXME: this test needs rewriting - test for feed contents
- end
+ assert_equal "application/atom+xml", response.content_type
+
+ check_feed_result(Changeset.all)
+ end
+
+ ##
+ # This should display the last 20 changesets closed in a specific area
+ def test_feed_bbox
+ get :feed, :format => :atom, :bbox => "4.5,4.5,5.5,5.5"
+ assert_response :success
+ assert_template "list"
+ assert_equal "application/atom+xml", response.content_type
+
+ check_feed_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000"))
end
##
# Checks the display of the user changesets feed
def test_feed_user
user = users(:public_user)
- get :feed, :format => "atom", :display_name => user.display_name
+
+ get :feed, :format => :atom, :display_name => user.display_name
assert_response :success
assert_template "list"
assert_equal "application/atom+xml", response.content_type
- # FIXME: need to add more checks to see which if edits are actually shown if your data is public
+
+ check_feed_result(user.changesets)
end
##
@@ -1863,6 +1953,14 @@ EOF
assert_response :not_found
end
+ ##
+ # Check that we can't request later pages of the changesets feed
+ def test_feed_max_id
+ get :feed, :format => "atom", :max_id => 100
+ assert_response :redirect
+ assert_redirected_to :action => :feed
+ end
+
##
# check that the changeset download for a changeset with a redacted
# element in it doesn't contain that element.
@@ -1891,26 +1989,44 @@ EOF
end
assert_response :success
+ changeset = changesets(:normal_user_subscribed_change)
+ changeset.subscribers.push(users(:normal_user))
+ changeset.subscribers.push(users(:public_user))
+ changeset.subscribers.push(users(:suspended_user))
+ changeset.subscribers.push(users(:deleted_user))
+
assert_difference "ChangesetComment.count", 1 do
- assert_no_difference "ActionMailer::Base.deliveries.size" do
- post :comment, :id => changesets(:normal_user_subscribed_change).id, :text => "This is a comment"
+ assert_difference "ActionMailer::Base.deliveries.size", 1 do
+ post :comment, :id => changeset.id, :text => "This is a comment"
end
end
assert_response :success
+ email = ActionMailer::Base.deliveries.first
+ assert_equal 1, email.to.length
+ assert_equal "[OpenStreetMap] test2 has commented on one of your changesets", email.subject
+ assert_equal "test@openstreetmap.org", email.to.first
+
+ ActionMailer::Base.deliveries.clear
+
basic_authorization(users(:second_public_user).email, "test")
assert_difference "ChangesetComment.count", 1 do
- assert_difference "ActionMailer::Base.deliveries.size", 1 do
- post :comment, :id => changesets(:normal_user_subscribed_change).id, :text => "This is a comment"
+ assert_difference "ActionMailer::Base.deliveries.size", 2 do
+ post :comment, :id => changeset.id, :text => "This is a comment"
end
end
assert_response :success
- email = ActionMailer::Base.deliveries.first
+ email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@openstreetmap.org" }
+ assert_not_nil email
+ assert_equal 1, email.to.length
+ assert_equal "[OpenStreetMap] pulibc_test2 has commented on one of your changesets", email.subject
+
+ email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@example.com" }
+ assert_not_nil email
assert_equal 1, email.to.length
assert_equal "[OpenStreetMap] pulibc_test2 has commented on a changeset you are interested in", email.subject
- assert_equal "test@example.com", email.to.first
ActionMailer::Base.deliveries.clear
end
@@ -1988,6 +2104,7 @@ EOF
# trying to subscribe when already subscribed
changeset = changesets(:normal_user_subscribed_change)
+ changeset.subscribers.push(users(:public_user))
assert_no_difference "changeset.subscribers.count" do
post :subscribe, :id => changeset.id
end
@@ -1999,6 +2116,7 @@ EOF
def test_unsubscribe_success
basic_authorization(users(:public_user).email, "test")
changeset = changesets(:normal_user_subscribed_change)
+ changeset.subscribers.push(users(:public_user))
assert_difference "changeset.subscribers.count", -1 do
post :unsubscribe, :id => changeset.id
@@ -2043,81 +2161,85 @@ EOF
# test hide comment fail
def test_hide_comment_fail
# unauthorized
- comment = changeset_comments(:normal_comment_1)
- assert("comment.visible") do
- post :hide_comment, :id => comment.id
- assert_response :unauthorized
- end
+ comment = create(:changeset_comment)
+ assert_equal true, comment.visible
+
+ post :hide_comment, :id => comment.id
+ assert_response :unauthorized
+ assert_equal true, comment.reload.visible
basic_authorization(users(:public_user).email, "test")
# not a moderator
- assert("comment.visible") do
- post :hide_comment, :id => comment.id
- assert_response :forbidden
- end
+ post :hide_comment, :id => comment.id
+ assert_response :forbidden
+ assert_equal true, comment.reload.visible
basic_authorization(users(:moderator_user).email, "test")
# bad comment id
post :hide_comment, :id => 999111
assert_response :not_found
+ assert_equal true, comment.reload.visible
end
##
# test hide comment succes
def test_hide_comment_success
- comment = changeset_comments(:normal_comment_1)
+ comment = create(:changeset_comment)
+ assert_equal true, comment.visible
basic_authorization(users(:moderator_user).email, "test")
- assert("!comment.visible") do
- post :hide_comment, :id => comment.id
- end
+ post :hide_comment, :id => comment.id
assert_response :success
+ assert_equal false, comment.reload.visible
end
##
# test unhide comment fail
def test_unhide_comment_fail
# unauthorized
- comment = changeset_comments(:normal_comment_1)
- assert("comment.visible") do
- post :unhide_comment, :id => comment.id
- assert_response :unauthorized
- end
+ comment = create(:changeset_comment, :visible => false)
+ assert_equal false, comment.visible
+
+ post :unhide_comment, :id => comment.id
+ assert_response :unauthorized
+ assert_equal false, comment.reload.visible
basic_authorization(users(:public_user).email, "test")
# not a moderator
- assert("comment.visible") do
- post :unhide_comment, :id => comment.id
- assert_response :forbidden
- end
+ post :unhide_comment, :id => comment.id
+ assert_response :forbidden
+ assert_equal false, comment.reload.visible
basic_authorization(users(:moderator_user).email, "test")
# bad comment id
post :unhide_comment, :id => 999111
assert_response :not_found
+ assert_equal false, comment.reload.visible
end
##
# test unhide comment succes
def test_unhide_comment_success
- comment = changeset_comments(:normal_comment_1)
+ comment = create(:changeset_comment, :visible => false)
+ assert_equal false, comment.visible
basic_authorization(users(:moderator_user).email, "test")
- assert("!comment.visible") do
- post :unhide_comment, :id => comment.id
- end
+ post :unhide_comment, :id => comment.id
assert_response :success
+ assert_equal true, comment.reload.visible
end
##
# test comments feed
def test_comments_feed
+ create_list(:changeset_comment, 3, :changeset_id => changesets(:normal_user_closed_change).id)
+
get :comments_feed, :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
@@ -2127,6 +2249,15 @@ EOF
end
end
+ get :comments_feed, :format => "rss", :limit => 2
+ 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 => 2
+ end
+ end
+
get :comments_feed, :id => changesets(:normal_user_closed_change), :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
@@ -2137,9 +2268,17 @@ EOF
end
end
- #------------------------------------------------------------
- # utility functions
- #------------------------------------------------------------
+ ##
+ # test comments feed
+ def test_comments_feed_bad_limit
+ get :comments_feed, :format => "rss", :limit => 0
+ assert_response :bad_request
+
+ get :comments_feed, :format => "rss", :limit => 100001
+ assert_response :bad_request
+ end
+
+ private
##
# boilerplate for checking that certain changesets exist in the
@@ -2183,4 +2322,39 @@ EOF
xml.find("//osm/way").first[name] = value.to_s
xml
end
+
+ ##
+ # check the result of a list
+ def check_list_result(changesets)
+ changesets = changesets.where("num_changes > 0")
+ .order(:created_at => :desc)
+ .limit(20)
+ assert changesets.size <= 20
+
+ assert_select "ol.changesets", :count => [changesets.size, 1].min do
+ assert_select "li", :count => changesets.size
+
+ changesets.each do |changeset|
+ assert_select "li#changeset_#{changeset.id}", :count => 1
+ end
+ end
+ end
+
+ ##
+ # check the result of a feed
+ def check_feed_result(changesets)
+ changesets = changesets.where("num_changes > 0")
+ .order(:created_at => :desc)
+ .limit(20)
+ assert changesets.size <= 20
+
+ assert_select "feed", :count => [changesets.size, 1].min do
+ assert_select "> title", :count => 1, :text => /^Changesets/
+ assert_select "> entry", :count => changesets.size
+
+ changesets.each do |changeset|
+ assert_select "> entry > id", changeset_url(:id => changeset.id)
+ end
+ end
+ end
end