class ChangesetControllerTest < ActionController::TestCase
api_fixtures
- fixtures :changeset_comments, :changesets_subscribers
+ fixtures :friends, :changeset_comments, :changesets_subscribers
##
# test all routes which lead to this controller
)
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 },
basic_authorization users(:normal_user).email, "test"
# Create the first user's changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_require_public_data
basic_authorization users(:public_user).email, "test"
# Create the first user's changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :success, "Creation of changeset did not return sucess status"
# create a temporary changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
assert_difference "Changeset.count", 1 do
put :create
end
# 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
##
<osmChange>
<create>
<node id='-1' lon='0' lat='0' changeset='#{cs_id}'>
- <tag k='foo' v='#{"x" * 256}'/>
+ <tag k='foo' v='#{'x' * 256}'/>
</node>
</create>
</osmChange>
basic_authorization users(:public_user).email, "test"
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
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
basic_authorization users(:public_user).email, "test"
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
["<osmChange/>",
"<osmChange></osmChange>",
"<osmChange><modify/></osmChange>",
- "<osmChange><modify></modify></osmChange>"
- ].each do |diff|
+ "<osmChange><modify></modify></osmChange>"].each do |diff|
# upload it
content diff
post :upload, :id => changesets(:public_user_first_change).id
# create a temporary changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :forbidden
# create a temporary changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
# create a temporary changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
# create a temporary changeset
content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
- "</changeset></osm>"
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
# 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
##
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"
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
"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
["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
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
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
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
##
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
##
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.
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
- assert_equal "test@openstreetmap.org", email.to.first
- email = ActionMailer::Base.deliveries.second
+ 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
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
+ 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)
+ 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 = changeset_comments(:hidden_comment)
+ 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 = changeset_comments(:hidden_comment)
+ 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
##
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
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
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
projects / rails.git / blobdiff