)
assert_routing(
{ :path => "/user/name/history", :method => :get },
- { :controller => "changeset", :action => "list", :display_name => "name" }
+ { :controller => "changeset", :action => "index", :display_name => "name" }
)
assert_routing(
{ :path => "/user/name/history/feed", :method => :get },
)
assert_routing(
{ :path => "/history/friends", :method => :get },
- { :controller => "changeset", :action => "list", :friends => true, :format => :html }
+ { :controller => "changeset", :action => "index", :friends => true, :format => :html }
)
assert_routing(
{ :path => "/history/nearby", :method => :get },
- { :controller => "changeset", :action => "list", :nearby => true, :format => :html }
+ { :controller => "changeset", :action => "index", :nearby => true, :format => :html }
)
assert_routing(
{ :path => "/history", :method => :get },
- { :controller => "changeset", :action => "list" }
+ { :controller => "changeset", :action => "index" }
)
assert_routing(
{ :path => "/history/feed", :method => :get },
def test_create
basic_authorization create(:user, :data_public => false).email, "test"
# Create the first user's changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_require_public_data
basic_authorization create(:user).email, "test"
# Create the first user's changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
def test_read
changeset_id = create(:changeset).id
- get :read, :id => changeset_id
+ get :read, :params => { :id => changeset_id }
assert_response :success, "cannot get first changeset"
assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
assert_select "osm>changeset[id='#{changeset_id}']", 1
assert_select "osm>changeset>discussion", 0
- get :read, :id => changeset_id, :include_discussion => true
+ get :read, :params => { :id => changeset_id, :include_discussion => true }
assert_response :success, "cannot get first changeset with comments"
assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
changeset_id = create(:changeset, :closed).id
create_list(:changeset_comment, 3, :changeset_id => changeset_id)
- get :read, :id => changeset_id, :include_discussion => true
+ get :read, :params => { :id => changeset_id, :include_discussion => true }
assert_response :success, "cannot get closed changeset with comments"
assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
def test_read_not_found
[0, -32, 233455644, "afg", "213"].each do |id|
begin
- get :read, :id => id
+ get :read, :params => { :id => id }
assert_response :not_found, "should get a not found"
rescue ActionController::UrlGenerationError => ex
- assert_match /No route matches/, ex.to_s
+ assert_match(/No route matches/, ex.to_s)
end
end
end
changeset = create(:changeset, :user => user)
## Try without authentication
- put :close, :id => changeset.id
+ put :close, :params => { :id => changeset.id }
assert_response :unauthorized
## Try using the non-public user
basic_authorization private_user.email, "test"
- put :close, :id => private_changeset.id
+ put :close, :params => { :id => private_changeset.id }
assert_require_public_data
## The try with the public user
basic_authorization user.email, "test"
cs_id = changeset.id
- put :close, :id => cs_id
+ put :close, :params => { :id => cs_id }
assert_response :success
# test that it really is closed now
cs = Changeset.find(cs_id)
- assert(!cs.is_open?,
- "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.")
+ assert_not(cs.is_open?,
+ "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.")
end
##
basic_authorization user.email, "test"
- put :close, :id => changeset.id
+ put :close, :params => { :id => changeset.id }
assert_response :conflict
assert_equal "The user doesn't own that changeset", @response.body
end
basic_authorization user.email, "test"
- get :close, :id => changeset.id
+ get :close, :params => { :id => changeset.id }
assert_response :method_not_allowed
- post :close, :id => changeset.id
+ post :close, :params => { :id => changeset.id }
assert_response :method_not_allowed
end
# First try to do it with no auth
cs_ids.each do |id|
begin
- put :close, :id => id
+ put :close, :params => { :id => id }
assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
rescue ActionController::UrlGenerationError => ex
- assert_match /No route matches/, ex.to_s
+ assert_match(/No route matches/, ex.to_s)
end
end
basic_authorization create(:user).email, "test"
cs_ids.each do |id|
begin
- put :close, :id => id
+ put :close, :params => { :id => id }
assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
rescue ActionController::UrlGenerationError => ex
- assert_match /No route matches/, ex.to_s
+ assert_match(/No route matches/, ex.to_s)
end
end
end
# simple diff to change a node, way and relation by removing
# their tags
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
</relation>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :unauthorized,
"shouldn't be able to upload a simple valid diff to changeset: #{@response.body}"
# simple diff to change a node, way and relation by removing
# their tags
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
</relation>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :forbidden,
"can't upload a simple valid diff to changeset: #{@response.body}"
# simple diff to change a node, way and relation by removing
# their tags
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
</relation>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"can't upload a simple valid diff to changeset: #{@response.body}"
basic_authorization user.email, "test"
# simple diff to create a node way and relation using placeholders
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
</relation>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload a simple valid creation to changeset: #{@response.body}"
new_rel_id = doc.find("//diffResult/relation").first["new_id"].to_i
# check the old IDs are all present and negative one
- assert_equal -1, doc.find("//diffResult/node").first["old_id"].to_i
- assert_equal -1, doc.find("//diffResult/way").first["old_id"].to_i
- assert_equal -1, doc.find("//diffResult/relation").first["old_id"].to_i
+ assert_equal(-1, doc.find("//diffResult/node").first["old_id"].to_i)
+ assert_equal(-1, doc.find("//diffResult/way").first["old_id"].to_i)
+ assert_equal(-1, doc.find("//diffResult/relation").first["old_id"].to_i)
# check the versions are present and equal one
assert_equal 1, doc.find("//diffResult/node").first["new_version"].to_i
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload a deletion diff to changeset: #{@response.body}"
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload a deletion diff to changeset: #{@response.body}"
end
def test_repeated_changeset_create
- 30.times do
+ 3.times do
basic_authorization create(:user).email, "test"
# create a temporary changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
assert_difference "Changeset.count", 1 do
put :create
assert_response :success, "Should be able to create a changeset: #{@response.body}"
changeset_id = @response.body.to_i
- # upload some widely-spaced nodes, spiralling positive and negative to cause
- # largest bbox over-expansion possible.
- diff = <<EOF.strip_heredoc
+ # upload some widely-spaced nodes, spiralling positive and negative
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/>
<node id='-18' lon='179.9' lat='89.9' changeset='#{changeset_id}'/>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it, which used to cause an error like "PGError: ERROR:
# integer out of range" (bug #2152). but shouldn't any more.
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"can't upload a spatially-large diff to changeset: #{@response.body}"
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_lat <= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
end
##
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :precondition_failed,
"shouldn't be able to upload a invalid deletion diff: #{@response.body}"
assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't do a conditional delete of in use objects: #{@response.body}"
basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
</node>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shoudln't be able to upload too long a tag to changeset: #{@response.body}"
end
basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
</relation>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload a complex diff to changeset: #{@response.body}"
assert_equal 2, Node.find(new_node_id).tags.size, "new node should have two tags"
assert_equal [new_node_id, node.id], Way.find(way.id).nds, "way nodes should match"
Relation.find(relation.id).members.each do |type, id, _role|
- if type == "node"
- assert_equal new_node_id, id, "relation should contain new node"
- end
+ assert_equal new_node_id, id, "relation should contain new node" if type == "node"
end
end
basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
</node>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :conflict,
"uploading a diff with multiple changesets should have failed"
# change the location of a node multiple times, each time referencing
# the last version. doesn't this depend on version numbers being
# sequential?
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
<node id='#{node.id}' lon='9' lat='9' changeset='#{changeset.id}' version='8'/>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload multiple versions of an element in a diff: #{@response.body}"
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :conflict,
"shouldn't be able to upload the same element twice in a diff: #{@response.body}"
end
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shouldn't be able to upload an element without version: #{@response.body}"
end
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<ping>
<node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
</ping>
</osmChange>
-EOF
+CHANGESET
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
assert_equal @response.body, "Unknown action ping, choices are create, modify, delete"
end
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}'
version='1'></node>
<member type='relation' role='some' ref='#{other_relation.id}'/>
</relation>
</modify></osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
<node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
</delete>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
<node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shouldn't be able to re-use placeholder IDs"
end
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
</way>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
# the same again, but this time use an existing way
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
</way>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder node not found for reference -4 in way #{way.id}", @response.body
basic_authorization changeset.user.email, "test"
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
</relation>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
# the same again, but this time use an existing relation
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<create>
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
</relation>
</create>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder Way not found for reference -1 in relation #{relation.id}.", @response.body
def test_upload_node_move
basic_authorization create(:user).email, "test"
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_response :success
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"diff should have uploaded OK"
def test_upload_way_extend
basic_authorization create(:user).email, "test"
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_response :success
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"diff should have uploaded OK"
"<osmChange><modify></modify></osmChange>"].each do |diff|
# upload it
content diff
- post :upload, :id => changeset.id
- assert_response(:success, "should be able to upload " +
+ post :upload, :params => { :id => changeset.id }
+ assert_response(:success, "should be able to upload " \
"empty changeset: " + diff)
end
end
# upload it
content diff
error_format "xml"
- post :upload, :id => changeset.id
+ post :upload, :params => { :id => changeset.id }
assert_response :success,
"failed to return error in XML format"
node = create(:node)
## First try with a non-public user, which should get a forbidden
- basic_authorization(create(:user, :data_public => false).email, "test")
+ basic_authorization create(:user, :data_public => false).email, "test"
# create a temporary changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_response :forbidden
## Now try with a normal user
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# create a temporary changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
# add a diff to it
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<modify>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
<node id='#{node.id}' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"can't upload multiple versions of an element in a diff: #{@response.body}"
- get :download, :id => changeset_id
+ get :download, :params => { :id => changeset_id }
assert_response :success
assert_select "osmChange", 1
#
# NOTE: the error turned out to be something else completely!
def test_josm_upload
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# create a temporary changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_response :success
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"can't upload a diff from JOSM: #{@response.body}"
- get :download, :id => changeset_id
+ get :download, :params => { :id => changeset_id }
assert_response :success
assert_select "osmChange", 1
node = create(:node)
node2 = create(:node)
way = create(:way)
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# create a temporary changeset
- content "<osm><changeset>" +
- "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ content "<osm><changeset>" \
+ "<tag k='created_by' v='osm test suite checking changesets'/>" \
"</changeset></osm>"
put :create
assert_response :success
changeset_id = @response.body.to_i
# add a diff to it
- diff = <<EOF.strip_heredoc
+ diff = <<CHANGESET.strip_heredoc
<osmChange>
<delete>
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
</way>
</modify>
</osmChange>
-EOF
+CHANGESET
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :params => { :id => changeset_id }
assert_response :success,
"can't upload multiple versions of an element in a diff: #{@response.body}"
- get :download, :id => changeset_id
+ get :download, :params => { :id => changeset_id }
assert_response :success
assert_select "osmChange", 1
_relation = create(:relation, :with_history, :version => 1, :changeset => changeset)
_relation2 = create(:relation, :with_history, :deleted, :version => 1, :changeset => changeset)
- get :download, :id => changeset.id
+ get :download, :params => { :id => changeset.id }
assert_response :success
assert_template nil
end
# get the bounding box back from the changeset
- get :read, :id => changeset_id
+ get :read, :params => { :id => changeset_id }
assert_response :success, "Couldn't read back changeset."
- assert_select "osm>changeset[min_lon='1.0']", 1
- assert_select "osm>changeset[max_lon='1.0']", 1
- assert_select "osm>changeset[min_lat='2.0']", 1
- assert_select "osm>changeset[max_lat='2.0']", 1
+ assert_select "osm>changeset[min_lon='1.0000000']", 1
+ assert_select "osm>changeset[max_lon='1.0000000']", 1
+ assert_select "osm>changeset[min_lat='2.0000000']", 1
+ assert_select "osm>changeset[max_lat='2.0000000']", 1
# add another node to it
with_controller(NodeController.new) do
end
# get the bounding box back from the changeset
- get :read, :id => changeset_id
+ get :read, :params => { :id => changeset_id }
assert_response :success, "Couldn't read back changeset for the second time."
- assert_select "osm>changeset[min_lon='1.0']", 1
- assert_select "osm>changeset[max_lon='2.0']", 1
- assert_select "osm>changeset[min_lat='1.0']", 1
- assert_select "osm>changeset[max_lat='2.0']", 1
+ assert_select "osm>changeset[min_lon='1.0000000']", 1
+ assert_select "osm>changeset[max_lon='2.0000000']", 1
+ assert_select "osm>changeset[min_lat='1.0000000']", 1
+ assert_select "osm>changeset[max_lat='2.0000000']", 1
# add (delete) a way to it, which contains a point at (3,3)
with_controller(WayController.new) do
content update_changeset(way.to_xml, changeset_id)
- put :delete, :id => way.id
+ put :delete, :params => { :id => way.id }
assert_response :success, "Couldn't delete a way."
end
# get the bounding box back from the changeset
- get :read, :id => changeset_id
+ get :read, :params => { :id => changeset_id }
assert_response :success, "Couldn't read back changeset for the third time."
- # note that the 3.1 here is because of the bbox overexpansion
- assert_select "osm>changeset[min_lon='1.0']", 1
- assert_select "osm>changeset[max_lon='3.1']", 1
- assert_select "osm>changeset[min_lat='1.0']", 1
- assert_select "osm>changeset[max_lat='3.1']", 1
+ assert_select "osm>changeset[min_lon='1.0000000']", 1
+ assert_select "osm>changeset[max_lon='3.0000000']", 1
+ assert_select "osm>changeset[min_lat='1.0000000']", 1
+ assert_select "osm>changeset[max_lat='3.0000000']", 1
end
##
# Try and put
content "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
- put :expand_bbox, :id => changeset_id
+ put :expand_bbox, :params => { :id => changeset_id }
assert_response :method_not_allowed, "shouldn't be able to put a bbox expand"
# Try to get the update
content "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
- get :expand_bbox, :id => changeset_id
+ get :expand_bbox, :params => { :id => changeset_id }
assert_response :method_not_allowed, "shouldn't be able to get a bbox expand"
# Try to use a hopefully missing changeset
content "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
- post :expand_bbox, :id => changeset_id + 13245
+ post :expand_bbox, :params => { :id => changeset_id + 13245 }
assert_response :not_found, "shouldn't be able to do a bbox expand on a nonexistant changeset"
end
changeset2 = create(:changeset, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 15 * GeoRecord::SCALE, :max_lon => 15 * GeoRecord::SCALE)
changeset3 = create(:changeset, :min_lat => 4.5 * GeoRecord::SCALE, :min_lon => 4.5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
- get :query, :bbox => "-10,-10, 10, 10"
+ get :query, :params => { :bbox => "-10,-10, 10, 10" }
assert_response :success, "can't get changesets in bbox"
assert_changesets [changeset2, changeset3]
- get :query, :bbox => "4.5,4.5,4.6,4.6"
+ get :query, :params => { :bbox => "4.5,4.5,4.6,4.6" }
assert_response :success, "can't get changesets in bbox"
assert_changesets [changeset3]
# not found when looking for changesets of non-existing users
- get :query, :user => User.maximum(:id) + 1
+ get :query, :params => { :user => User.maximum(:id) + 1 }
assert_response :not_found
- get :query, :display_name => " "
+ get :query, :params => { :display_name => " " }
assert_response :not_found
# can't get changesets of user 1 without authenticating
- get :query, :user => private_user.id
+ get :query, :params => { :user => private_user.id }
assert_response :not_found, "shouldn't be able to get changesets by non-public user (ID)"
- get :query, :display_name => private_user.display_name
+ get :query, :params => { :display_name => private_user.display_name }
assert_response :not_found, "shouldn't be able to get changesets by non-public user (name)"
# but this should work
basic_authorization private_user.email, "test"
- get :query, :user => private_user.id
+ get :query, :params => { :user => private_user.id }
assert_response :success, "can't get changesets by user ID"
assert_changesets [private_user_changeset, private_user_closed_changeset]
- get :query, :display_name => private_user.display_name
+ get :query, :params => { :display_name => private_user.display_name }
assert_response :success, "can't get changesets by user name"
assert_changesets [private_user_changeset, private_user_closed_changeset]
# check that the correct error is given when we provide both UID and name
- get :query, :user => private_user.id, :display_name => private_user.display_name
+ get :query, :params => { :user => private_user.id,
+ :display_name => private_user.display_name }
assert_response :bad_request, "should be a bad request to have both ID and name specified"
- get :query, :user => private_user.id, :open => true
+ get :query, :params => { :user => private_user.id, :open => true }
assert_response :success, "can't get changesets by user and open"
assert_changesets [private_user_changeset]
- get :query, :time => "2007-12-31"
+ get :query, :params => { :time => "2007-12-31" }
assert_response :success, "can't get changesets by time-since"
assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3]
- get :query, :time => "2008-01-01T12:34Z"
+ get :query, :params => { :time => "2008-01-01T12:34Z" }
assert_response :success, "can't get changesets by time-since with hour"
assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3]
- get :query, :time => "2007-12-31T23:59Z,2008-01-02T00:01Z"
+ get :query, :params => { :time => "2007-12-31T23:59Z,2008-01-02T00:01Z" }
assert_response :success, "can't get changesets by time-range"
assert_changesets [closed_changeset]
- get :query, :open => "true"
+ get :query, :params => { :open => "true" }
assert_response :success, "can't get changesets by open-ness"
assert_changesets [private_user_changeset, changeset, changeset2, changeset3]
- get :query, :closed => "true"
+ get :query, :params => { :closed => "true" }
assert_response :success, "can't get changesets by closed-ness"
assert_changesets [private_user_closed_changeset, closed_changeset]
- get :query, :closed => "true", :user => private_user.id
+ get :query, :params => { :closed => "true", :user => private_user.id }
assert_response :success, "can't get changesets by closed-ness and user"
assert_changesets [private_user_closed_changeset]
- get :query, :closed => "true", :user => user.id
+ get :query, :params => { :closed => "true", :user => user.id }
assert_response :success, "can't get changesets by closed-ness and user"
assert_changesets [closed_changeset]
- get :query, :changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}"
+ get :query, :params => { :changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}" }
assert_response :success, "can't get changesets by id (as comma-separated string)"
assert_changesets [private_user_changeset, changeset, closed_changeset]
- get :query, :changesets => ""
+ get :query, :params => { :changesets => "" }
assert_response :bad_request, "should be a bad request since changesets is empty"
end
["abracadabra!",
"1,2,3,F",
";drop table users;"].each do |bbox|
- get :query, :bbox => bbox
+ get :query, :params => { :bbox => bbox }
assert_response :bad_request, "'#{bbox}' isn't a bbox"
end
";drop table users;",
",",
"-,-"].each do |time|
- get :query, :time => time
+ get :query, :params => { :time => time }
assert_response :bad_request, "'#{time}' isn't a valid time range"
end
"foobar",
"-1",
"0"].each do |uid|
- get :query, :user => uid
+ get :query, :params => { :user => uid }
assert_response :bad_request, "'#{uid}' isn't a valid user ID"
end
end
content new_changeset
# try without any authorization
- put :update, :id => private_changeset.id
+ put :update, :params => { :id => private_changeset.id }
assert_response :unauthorized
# try with the wrong authorization
basic_authorization create(:user).email, "test"
- put :update, :id => private_changeset.id
+ put :update, :params => { :id => private_changeset.id }
assert_response :conflict
# now this should get an unauthorized
basic_authorization private_user.email, "test"
- put :update, :id => private_changeset.id
+ put :update, :params => { :id => private_changeset.id }
assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset"
## Now try with the public user
# try without any authorization
@request.env["HTTP_AUTHORIZATION"] = nil
- put :update, :id => changeset.id
+ put :update, :params => { :id => changeset.id }
assert_response :unauthorized
# try with the wrong authorization
basic_authorization create(:user).email, "test"
- put :update, :id => changeset.id
+ put :update, :params => { :id => changeset.id }
assert_response :conflict
# now this should work...
basic_authorization user.email, "test"
- put :update, :id => changeset.id
+ put :update, :params => { :id => changeset.id }
assert_response :success
assert_select "osm>changeset[id='#{changeset.id}']", 1
new_changeset.find("//osm/changeset").first << new_tag
content new_changeset
- put :update, :id => changeset.id
+ put :update, :params => { :id => changeset.id }
assert_response :conflict
end
assert_response :success, "can't create a new node"
node_id = @response.body.to_i
- get :read, :id => node_id
+ get :read, :params => { :id => node_id }
assert_response :success, "can't read back new node"
node_doc = XML::Parser.string(@response.body).parse
node_xml = node_doc.find("//osm/node").first
node_xml["version"] = (i + 1).to_s
content node_doc
- put :update, :id => node_id
+ put :update, :params => { :id => node_id }
assert_response :success, "attempt #{i} should have succeeded"
end
node_xml["version"] = offset.to_s
content node_doc
- put :update, :id => node_id
+ put :update, :params => { :id => node_id }
assert_response :conflict, "final attempt should have failed"
end
assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes
# check that the changeset is now closed as well
- assert(!changeset.is_open?,
- "changeset should have been auto-closed by exceeding " +
- "element limit.")
+ assert_not(changeset.is_open?,
+ "changeset should have been auto-closed by exceeding " \
+ "element limit.")
end
##
# This should display the last 20 changesets closed
- def test_list
- get :list, :format => "html"
+ def test_index
+ get :index, :params => { :format => "html" }
assert_response :success
assert_template "history"
assert_template :layout => "map"
assert_select "h2", :text => "Changesets", :count => 1
- xhr :get, :list, :format => "html", :list => "1"
+ get :index, :params => { :format => "html", :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.all)
+ check_index_result(Changeset.all)
end
##
# This should display the last 20 changesets closed
- def test_list_xhr
- xhr :get, :list, :format => "html"
+ def test_index_xhr
+ get :index, :params => { :format => "html" }, :xhr => true
assert_response :success
assert_template "history"
assert_template :layout => "xhr"
assert_select "h2", :text => "Changesets", :count => 1
- xhr :get, :list, :format => "html", :list => "1"
+ get :index, :params => { :format => "html", :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.all)
+ check_index_result(Changeset.all)
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"
+ def test_index_bbox
+ get :index, :params => { :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"
+ get :index, :params => { :format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000"))
+ check_index_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
+ def test_index_user
user = create(:user)
create(:changeset, :user => user)
create(:changeset, :closed, :user => user)
- get :list, :format => "html", :display_name => user.display_name
+ get :index, :params => { :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"
+ get :index, :params => { :format => "html", :display_name => user.display_name, :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(user.changesets)
+ check_index_result(user.changesets)
end
##
# Checks the display of the user changesets listing for a private user
- def test_list_private_user
+ def test_index_private_user
private_user = create(:user, :data_public => false)
create(:changeset, :user => private_user)
create(:changeset, :closed, :user => private_user)
- get :list, :format => "html", :display_name => private_user.display_name
+ get :index, :params => { :format => "html", :display_name => private_user.display_name }
assert_response :success
assert_template "history"
- xhr :get, :list, :format => "html", :display_name => private_user.display_name, :list => "1"
+ get :index, :params => { :format => "html", :display_name => private_user.display_name, :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.none)
+ check_index_result(Changeset.none)
end
##
- # Check the not found of the list user changesets
- def test_list_user_not_found
- get :list, :format => "html", :display_name => "Some random user"
+ # Check the not found of the index user changesets
+ def test_index_user_not_found
+ get :index, :params => { :format => "html", :display_name => "Some random user" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
- xhr :get, :list, :format => "html", :display_name => "Some random user", :list => "1"
+ get :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
end
##
# Checks the display of the friends changesets listing
- def test_list_friends
+ def test_index_friends
private_user = create(:user, :data_public => true)
friend = create(:friend, :befriender => private_user)
create(:changeset, :user => friend.befriendee)
- get :list, :friends => true
+ get :index, :params => { :friends => true }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path
+ assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
session[:user] = private_user.id
- get :list, :friends => true
+ get :index, :params => { :friends => true }
assert_response :success
assert_template "history"
- xhr :get, :list, :friends => true, :list => "1"
+ get :index, :params => { :friends => true, :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.where(:user => private_user.friend_users.identifiable))
+ check_index_result(Changeset.where(:user => private_user.friend_users.identifiable))
end
##
# Checks the display of the nearby user changesets listing
- def test_list_nearby
+ def test_index_nearby
private_user = create(:user, :data_public => false, :home_lat => 51.1, :home_lon => 1.0)
user = create(:user, :home_lat => 51.0, :home_lon => 1.0)
create(:changeset, :user => user)
- get :list, :nearby => true
+ get :index, :params => { :nearby => true }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path
+ assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
session[:user] = private_user.id
- get :list, :nearby => true
+ get :index, :params => { :nearby => true }
assert_response :success
assert_template "history"
- xhr :get, :list, :nearby => true, :list => "1"
+ get :index, :params => { :nearby => true, :list => "1" }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.where(:user => user.nearby))
+ check_index_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
+ # Check that we can't request later pages of the changesets index
+ def test_index_max_id
+ get :index, :params => { :format => "html", :max_id => 4 }, :xhr => true
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
+ get :index, :params => { :format => "html", :list => "1", :max_id => 4 }, :xhr => true
assert_response :success
- assert_template "list"
+ assert_template "index"
- check_list_result(Changeset.where("id <= 4"))
+ check_index_result(Changeset.where("id <= 4"))
+ end
+
+ ##
+ # Check that a list with a next page link works
+ def test_index_more
+ create_list(:changeset, 50)
+
+ get :index, :params => { :format => "html" }
+ assert_response :success
+
+ get :index, :params => { :format => "html" }, :xhr => true
+ assert_response :success
end
##
# This should display the last 20 non-empty changesets
def test_feed
changeset = create(:changeset, :num_changes => 1)
+ create(:changeset_tag, :changeset => changeset)
+ create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")
closed_changeset = create(:changeset, :closed, :num_changes => 1)
_empty_changeset = create(:changeset, :num_changes => 0)
- get :feed, :format => :atom
+ get :feed, :params => { :format => :atom }
assert_response :success
- assert_template "list"
+ assert_template "index"
assert_equal "application/atom+xml", response.content_type
check_feed_result([changeset, closed_changeset])
# This should display the last 20 changesets closed in a specific area
def test_feed_bbox
changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
+ create(:changeset_tag, :changeset => changeset)
+ create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")
closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
_elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
_empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
- get :feed, :format => :atom, :bbox => "4.5,4.5,5.5,5.5"
+ get :feed, :params => { :format => :atom, :bbox => "4.5,4.5,5.5,5.5" }
assert_response :success
- assert_template "list"
+ assert_template "index"
assert_equal "application/atom+xml", response.content_type
check_feed_result([changeset, closed_changeset])
def test_feed_user
user = create(:user)
changesets = create_list(:changeset, 3, :user => user, :num_changes => 4)
+ create(:changeset_tag, :changeset => changesets[1])
+ create(:changeset_tag, :changeset => changesets[1], :k => "website", :v => "http://example.com/")
_other_changeset = create(:changeset)
- get :feed, :format => :atom, :display_name => user.display_name
+ get :feed, :params => { :format => :atom, :display_name => user.display_name }
+
assert_response :success
- assert_template "list"
+ assert_template "index"
assert_equal "application/atom+xml", response.content_type
check_feed_result(changesets)
##
# Check the not found of the user changesets feed
def test_feed_user_not_found
- get :feed, :format => "atom", :display_name => "Some random user"
+ get :feed, :params => { :format => "atom", :display_name => "Some random user" }
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
+ get :feed, :params => { :format => "atom", :max_id => 100 }
assert_response :redirect
assert_redirected_to :action => :feed
end
node_v1 = node.old_nodes.find_by(:version => 1)
node_v1.redact!(create(:redaction))
- get :download, :id => changeset.id
+ get :download, :params => { :id => changeset.id }
assert_response :success
assert_select "osmChange", 1
deleted_user = create(:user, :deleted)
private_user_closed_changeset = create(:changeset, :closed, :user => private_user)
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
assert_difference "ChangesetComment.count", 1 do
assert_no_difference "ActionMailer::Base.deliveries.size" do
- post :comment, :id => private_user_closed_changeset.id, :text => "This is a comment"
+ post :comment, :params => { :id => private_user_closed_changeset.id, :text => "This is a comment" }
end
end
assert_response :success
assert_difference "ChangesetComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 1 do
- post :comment, :id => changeset.id, :text => "This is a comment"
+ post :comment, :params => { :id => changeset.id, :text => "This is a comment" }
end
end
assert_response :success
ActionMailer::Base.deliveries.clear
- basic_authorization(user2.email, "test")
+ basic_authorization user2.email, "test"
assert_difference "ChangesetComment.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 2 do
- post :comment, :id => changeset.id, :text => "This is a comment"
+ post :comment, :params => { :id => changeset.id, :text => "This is a comment" }
end
end
assert_response :success
# create comment fail
def test_create_comment_fail
# unauthorized
- post :comment, :id => create(:changeset, :closed).id, :text => "This is a comment"
+ post :comment, :params => { :id => create(:changeset, :closed).id, :text => "This is a comment" }
assert_response :unauthorized
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# bad changeset id
assert_no_difference "ChangesetComment.count" do
- post :comment, :id => 999111, :text => "This is a comment"
+ post :comment, :params => { :id => 999111, :text => "This is a comment" }
end
assert_response :not_found
# not closed changeset
assert_no_difference "ChangesetComment.count" do
- post :comment, :id => create(:changeset).id, :text => "This is a comment"
+ post :comment, :params => { :id => create(:changeset).id, :text => "This is a comment" }
end
assert_response :conflict
# no text
assert_no_difference "ChangesetComment.count" do
- post :comment, :id => create(:changeset, :closed).id
+ post :comment, :params => { :id => create(:changeset, :closed).id }
end
assert_response :bad_request
# empty text
assert_no_difference "ChangesetComment.count" do
- post :comment, :id => create(:changeset, :closed).id, :text => ""
+ post :comment, :params => { :id => create(:changeset, :closed).id, :text => "" }
end
assert_response :bad_request
end
##
# test subscribe success
def test_subscribe_success
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
changeset = create(:changeset, :closed)
assert_difference "changeset.subscribers.count", 1 do
- post :subscribe, :id => changeset.id
+ post :subscribe, :params => { :id => changeset.id }
+ end
+ assert_response :success
+
+ # not closed changeset
+ changeset = create(:changeset)
+ assert_difference "changeset.subscribers.count", 1 do
+ post :subscribe, :params => { :id => changeset.id }
end
assert_response :success
end
# unauthorized
changeset = create(:changeset, :closed)
assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => changeset.id
+ post :subscribe, :params => { :id => changeset.id }
end
assert_response :unauthorized
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
# bad changeset id
assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => 999111
+ post :subscribe, :params => { :id => 999111 }
end
assert_response :not_found
- # not closed changeset
- changeset = create(:changeset)
- assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => changeset.id
- end
- assert_response :conflict
-
# trying to subscribe when already subscribed
changeset = create(:changeset, :closed)
changeset.subscribers.push(user)
assert_no_difference "changeset.subscribers.count" do
- post :subscribe, :id => changeset.id
+ post :subscribe, :params => { :id => changeset.id }
end
assert_response :conflict
end
# test unsubscribe success
def test_unsubscribe_success
user = create(:user)
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
changeset = create(:changeset, :closed)
changeset.subscribers.push(user)
assert_difference "changeset.subscribers.count", -1 do
- post :unsubscribe, :id => changeset.id
+ post :unsubscribe, :params => { :id => changeset.id }
+ end
+ assert_response :success
+
+ # not closed changeset
+ changeset = create(:changeset)
+ changeset.subscribers.push(user)
+
+ assert_difference "changeset.subscribers.count", -1 do
+ post :unsubscribe, :params => { :id => changeset.id }
end
assert_response :success
end
# unauthorized
changeset = create(:changeset, :closed)
assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => changeset.id
+ post :unsubscribe, :params => { :id => changeset.id }
end
assert_response :unauthorized
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# bad changeset id
assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => 999111
+ post :unsubscribe, :params => { :id => 999111 }
end
assert_response :not_found
- # not closed changeset
- changeset = create(:changeset)
- assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => changeset.id
- end
- assert_response :conflict
-
# trying to unsubscribe when not subscribed
changeset = create(:changeset, :closed)
assert_no_difference "changeset.subscribers.count" do
- post :unsubscribe, :id => changeset.id
+ post :unsubscribe, :params => { :id => changeset.id }
end
assert_response :not_found
end
comment = create(:changeset_comment)
assert_equal true, comment.visible
- post :hide_comment, :id => comment.id
+ post :hide_comment, :params => { :id => comment.id }
assert_response :unauthorized
assert_equal true, comment.reload.visible
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# not a moderator
- post :hide_comment, :id => comment.id
+ post :hide_comment, :params => { :id => comment.id }
assert_response :forbidden
assert_equal true, comment.reload.visible
- basic_authorization(create(:moderator_user).email, "test")
+ basic_authorization create(:moderator_user).email, "test"
# bad comment id
- post :hide_comment, :id => 999111
+ post :hide_comment, :params => { :id => 999111 }
assert_response :not_found
assert_equal true, comment.reload.visible
end
comment = create(:changeset_comment)
assert_equal true, comment.visible
- basic_authorization(create(:moderator_user).email, "test")
+ basic_authorization create(:moderator_user).email, "test"
- post :hide_comment, :id => comment.id
+ post :hide_comment, :params => { :id => comment.id }
assert_response :success
assert_equal false, comment.reload.visible
end
comment = create(:changeset_comment, :visible => false)
assert_equal false, comment.visible
- post :unhide_comment, :id => comment.id
+ post :unhide_comment, :params => { :id => comment.id }
assert_response :unauthorized
assert_equal false, comment.reload.visible
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# not a moderator
- post :unhide_comment, :id => comment.id
+ post :unhide_comment, :params => { :id => comment.id }
assert_response :forbidden
assert_equal false, comment.reload.visible
- basic_authorization(create(:moderator_user).email, "test")
+ basic_authorization create(:moderator_user).email, "test"
# bad comment id
- post :unhide_comment, :id => 999111
+ post :unhide_comment, :params => { :id => 999111 }
assert_response :not_found
assert_equal false, comment.reload.visible
end
comment = create(:changeset_comment, :visible => false)
assert_equal false, comment.visible
- basic_authorization(create(:moderator_user).email, "test")
+ basic_authorization create(:moderator_user).email, "test"
- post :unhide_comment, :id => comment.id
+ post :unhide_comment, :params => { :id => comment.id }
assert_response :success
assert_equal true, comment.reload.visible
end
changeset = create(:changeset, :closed)
create_list(:changeset_comment, 3, :changeset => changeset)
- get :comments_feed, :format => "rss"
+ get :comments_feed, :params => { :format => "rss" }
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
end
end
- get :comments_feed, :format => "rss", :limit => 2
+ get :comments_feed, :params => { :format => "rss", :limit => 2 }
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
end
end
- get :comments_feed, :id => changeset.id, :format => "rss"
+ get :comments_feed, :params => { :id => changeset.id, :format => "rss" }
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
##
# test comments feed
def test_comments_feed_bad_limit
- get :comments_feed, :format => "rss", :limit => 0
+ get :comments_feed, :params => { :format => "rss", :limit => 0 }
assert_response :bad_request
- get :comments_feed, :format => "rss", :limit => 100001
+ get :comments_feed, :params => { :format => "rss", :limit => 100001 }
assert_response :bad_request
end
# call the include method and assert properties of the bbox
def check_after_include(changeset_id, lon, lat, bbox)
content "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
- post :expand_bbox, :id => changeset_id
+ post :expand_bbox, :params => { :id => changeset_id }
assert_response :success, "Setting include of changeset failed: #{@response.body}"
# check exactly one changeset
end
##
- # check the result of a list
- def check_list_result(changesets)
+ # check the result of a index
+ def check_index_result(changesets)
changesets = changesets.where("num_changes > 0")
.order(:created_at => :desc)
.limit(20)
projects / rails.git / blobdiff