-require 'test_helper'
-require 'changeset_controller'
+require "test_helper"
+require "changeset_controller"
class ChangesetControllerTest < ActionController::TestCase
api_fixtures
)
assert_routing(
{ :path => "/changeset/1/comments/feed", :method => :get },
- { :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
+ { :controller => "changeset", :action => "comments_feed", :id => "1", :format => "rss" }
)
assert_routing(
{ :path => "/user/name/history", :method => :get },
)
assert_routing(
{ :path => "/history/comments/feed", :method => :get },
- { :controller => "changeset", :action => "comments_feed", :format =>"rss" }
+ { :controller => "changeset", :action => "comments_feed", :format => "rss" }
)
end
put :create
assert_require_public_data
-
basic_authorization users(:public_user).email, "test"
# Create the first user's changeset
content "<osm><changeset>" +
# the difference can either be a rational, or a floating point number
# of seconds, depending on the code path taken :-(
if duration.class == Rational
- assert_equal Rational(1,24), duration , "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
+ assert_equal Rational(1, 24), duration, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
else
# must be number of seconds...
assert_equal 3600, duration.round, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
# document structure.
def test_read
changeset_id = changesets(:normal_user_first_change).id
+
get :read, :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", 1
+ assert_select "osm>changeset>discussion>comment", 0
+
+ changeset_id = changesets(:normal_user_closed_change).id
+
+ get :read, :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
+ assert_select "osm>changeset[id='#{changeset_id}']", 1
+ assert_select "osm>changeset>discussion", 1
+ assert_select "osm>changeset>discussion>comment", 3
end
##
put :close, :id => changesets(:public_user_first_change).id
assert_response :unauthorized
-
## Try using the non-public user
basic_authorization users(:normal_user).email, "test"
put :close, :id => changesets(:normal_user_first_change).id
assert_require_public_data
-
## The try with the public user
basic_authorization users(:public_user).email, "test"
content diff
post :upload, :id => changeset_id
assert_response :unauthorized,
- "shouldnn't be able to upload a simple valid diff to changeset: #{@response.body}"
-
-
+ "shouldnn't be able to upload a simple valid diff to changeset: #{@response.body}"
## Now try with a private user
basic_authorization users(:normal_user).email, "test"
content diff
post :upload, :id => changeset_id
assert_response :forbidden,
- "can't upload a simple valid diff to changeset: #{@response.body}"
-
-
+ "can't upload a simple valid diff to changeset: #{@response.body}"
## Now try with the public user
basic_authorization users(:public_user).email, "test"
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload a simple valid diff to changeset: #{@response.body}"
+ "can't upload a simple valid diff to changeset: #{@response.body}"
# check that the changes made it into the database
assert_equal 0, Node.find(1).tags.size, "node 1 should now have no tags"
content diff
post :upload, :id => cs_id
assert_response :success,
- "can't upload a simple valid creation to changeset: #{@response.body}"
+ "can't upload a simple valid creation to changeset: #{@response.body}"
# check the returned payload
assert_select "diffResult[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
# update the changeset to one that this user owns
changeset_id = changesets(:public_user_first_change).id
- ["node", "way", "relation"].each do |type|
+ %w(node way relation).each do |type|
delete.find("//osmChange/delete/#{type}").each do |n|
- n['changeset'] = changeset_id.to_s
+ n["changeset"] = changeset_id.to_s
end
end
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload a deletion diff to changeset: #{@response.body}"
+ "can't upload a deletion diff to changeset: #{@response.body}"
# check the response is well-formed
assert_select "diffResult>node", 1
content diff
post :upload, :id => cs.id
assert_response :success,
- "can't upload a deletion diff to changeset: #{@response.body}"
+ "can't upload a deletion diff to changeset: #{@response.body}"
# check the response is well-formed
assert_select "diffResult>node", 1
content "<osm><changeset>" +
"<tag k='created_by' v='osm test suite checking changesets'/>" +
"</changeset></osm>"
- assert_difference('Changeset.count', 1) do
+ assert_difference("Changeset.count", 1) do
put :create
end
assert_response :success
- changeset_id = @response.body.to_i
end
end
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload a spatially-large diff to changeset: #{@response.body}"
+ "can't upload a spatially-large diff to changeset: #{@response.body}"
# check that the changeset bbox is within bounds
cs = Changeset.find(changeset_id)
content diff
post :upload, :id => 2
assert_response :precondition_failed,
- "shouldn't be able to upload a invalid deletion diff: #{@response.body}"
+ "shouldn't be able to upload a invalid deletion diff: #{@response.body}"
assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body
# check that nothing was, in fact, deleted
content diff
post :upload, :id => 2
assert_response :success,
- "can't do a conditional delete of in use objects: #{@response.body}"
+ "can't do a conditional delete of in use objects: #{@response.body}"
# check the returned payload
assert_select "diffResult[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
<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>
content diff
post :upload, :id => cs_id
assert_response :bad_request,
- "shoudln't be able to upload too long a tag to changeset: #{@response.body}"
-
+ "shoudln't be able to upload too long a tag to changeset: #{@response.body}"
end
##
content diff
post :upload, :id => cs_id
assert_response :success,
- "can't upload a complex diff to changeset: #{@response.body}"
+ "can't upload a complex diff to changeset: #{@response.body}"
# check the returned payload
assert_select "diffResult[version='#{API_VERSION}'][generator='#{GENERATOR}']", 1
# check that the changes made it into the database
assert_equal 2, Node.find(new_node_id).tags.size, "new node should have two tags"
assert_equal [new_node_id, 3], Way.find(1).nds, "way nodes should match"
- Relation.find(1).members.each do |type,id,role|
- if type == 'node'
+ Relation.find(1).members.each do |type, id, _role|
+ if type == "node"
assert_equal new_node_id, id, "relation should contain new node"
end
end
content diff
post :upload, :id => cs_id
assert_response :conflict,
- "uploading a diff with multiple changsets should have failed"
+ "uploading a diff with multiple changsets should have failed"
# check that objects are unmodified
assert_nodes_are_equal(node, Node.find(1))
assert_ways_are_equal(way, Way.find(1))
+ assert_relations_are_equal(rel, Relation.find(1))
end
##
content diff
post :upload, :id => cs_id
assert_response :success,
- "can't upload multiple versions of an element in a diff: #{@response.body}"
+ "can't upload multiple versions of an element in a diff: #{@response.body}"
# check the response is well-formed. its counter-intuitive, but the
# API will return multiple elements with the same ID and different
content diff
post :upload, :id => cs_id
assert_response :conflict,
- "shouldn't be able to upload the same element twice in a diff: #{@response.body}"
+ "shouldn't be able to upload the same element twice in a diff: #{@response.body}"
end
##
content diff
post :upload, :id => cs_id
assert_response :bad_request,
- "shouldn't be able to upload an element without version: #{@response.body}"
+ "shouldn't be able to upload an element without version: #{@response.body}"
end
##
</ping>
</osmChange>
EOF
- content diff
- post :upload, :id => cs_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"
+ content diff
+ post :upload, :id => cs_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
##
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
+ "can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
# check the response is well-formed
assert_select "diffResult>node", 2
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
+ "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
# check the response is well-formed
assert_select "diffResult>node", 3
content diff
post :upload, :id => changeset_id
assert_response :bad_request,
- "shouldn't be able to re-use placeholder IDs"
+ "shouldn't be able to re-use placeholder IDs"
end
##
content diff
post :upload, :id => changeset_id
assert_response :bad_request,
- "shouldn't be able to use invalid placeholder IDs"
+ "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
content diff
post :upload, :id => changeset_id
assert_response :bad_request,
- "shouldn't be able to use invalid placeholder IDs"
+ "shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder node not found for reference -4 in way 1", @response.body
end
content diff
post :upload, :id => changeset_id
assert_response :bad_request,
- "shouldn't be able to use invalid placeholder IDs"
+ "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 way
content diff
post :upload, :id => changeset_id
assert_response :bad_request,
- "shouldn't be able to use invalid placeholder IDs"
+ "shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder Way not found for reference -1 in relation 1.", @response.body
end
content diff
post :upload, :id => changeset_id
assert_response :success,
- "diff should have uploaded OK"
+ "diff should have uploaded OK"
# check the bbox
changeset = Changeset.find(changeset_id)
- assert_equal 1*GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree"
- assert_equal 2*GeoRecord::SCALE, changeset.max_lon, "max_lon should be 2 degrees"
- assert_equal 1*GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree"
- assert_equal 2*GeoRecord::SCALE, changeset.max_lat, "max_lat should be 2 degrees"
+ assert_equal 1 * GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree"
+ assert_equal 2 * GeoRecord::SCALE, changeset.max_lon, "max_lon should be 2 degrees"
+ assert_equal 1 * GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree"
+ assert_equal 2 * GeoRecord::SCALE, changeset.max_lat, "max_lat should be 2 degrees"
end
##
content diff
post :upload, :id => changeset_id
assert_response :success,
- "diff should have uploaded OK"
+ "diff should have uploaded OK"
# check the bbox
changeset = Changeset.find(changeset_id)
- assert_equal 1*GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree"
- assert_equal 3*GeoRecord::SCALE, changeset.max_lon, "max_lon should be 3 degrees"
- assert_equal 1*GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree"
- assert_equal 3*GeoRecord::SCALE, changeset.max_lat, "max_lat should be 3 degrees"
+ assert_equal 1 * GeoRecord::SCALE, changeset.min_lon, "min_lon should be 1 degree"
+ assert_equal 3 * GeoRecord::SCALE, changeset.max_lon, "max_lon should be 3 degrees"
+ assert_equal 1 * GeoRecord::SCALE, changeset.min_lat, "min_lat should be 1 degree"
+ assert_equal 3 * GeoRecord::SCALE, changeset.max_lat, "max_lat should be 3 degrees"
end
##
def test_upload_empty_invalid
basic_authorization users(:public_user).email, "test"
- [ "<osmChange/>",
- "<osmChange></osmChange>",
- "<osmChange><modify/></osmChange>",
- "<osmChange><modify></modify></osmChange>"
+ ["<osmChange/>",
+ "<osmChange></osmChange>",
+ "<osmChange><modify/></osmChange>",
+ "<osmChange><modify></modify></osmChange>"
].each do |diff|
# upload it
content diff
error_format "xml"
post :upload, :id => 2
assert_response :success,
- "failed to return error in XML format"
+ "failed to return error in XML format"
# check the returned payload
assert_select "osmError[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
assert_select "osmError>status", 1
assert_select "osmError>message", 1
-
end
##
put :create
assert_response :forbidden
-
-
## Now try with the public user
basic_authorization(users(:public_user).email, "test")
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload multiple versions of an element in a diff: #{@response.body}"
+ "can't upload multiple versions of an element in a diff: #{@response.body}"
get :download, :id => changeset_id
assert_response :success
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload a diff from JOSM: #{@response.body}"
+ "can't upload a diff from JOSM: #{@response.body}"
get :download, :id => changeset_id
assert_response :success
content diff
post :upload, :id => changeset_id
assert_response :success,
- "can't upload multiple versions of an element in a diff: #{@response.body}"
+ "can't upload multiple versions of an element in a diff: #{@response.body}"
get :download, :id => changeset_id
assert_response :success
get :download, :id => changesets(:normal_user_first_change).id
assert_response :success
assert_template nil
- #print @response.body
- # FIXME needs more assert_select tests
+ # print @response.body
+ # FIXME: needs more assert_select tests
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
##
# check that the bounding box of a changeset gets updated correctly
- ## FIXME: This should really be moded to a integration test due to the with_controller
+ # FIXME: This should really be moded to a integration test due to the with_controller
def test_changeset_bbox
basic_authorization users(:public_user).email, "test"
# 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, 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
assert_response :success, "Creating of changeset failed."
changeset_id = @response.body.to_i
- lon=58.2
- lat=-0.45
+ lon = 58.2
+ lat = -0.45
# Try and put
content "<osm><node lon='#{lon}' lat='#{lat}'/></osm>"
# 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, :id => changeset_id + 13245
assert_response :not_found, "shouldn't be able to do a bbox expand on a nonexistant changeset"
-
end
##
def test_query
get :query, :bbox => "-10,-10, 10, 10"
assert_response :success, "can't get changesets in bbox"
- assert_changesets [1,4,6]
+ assert_changesets [1, 4, 6]
get :query, :bbox => "4.5,4.5,4.6,4.6"
assert_response :success, "can't get changesets in bbox"
basic_authorization "test@openstreetmap.org", "test"
get :query, :user => users(:normal_user).id
assert_response :success, "can't get changesets by user ID"
- assert_changesets [1,3,6,8]
+ assert_changesets [1, 3, 6, 8]
get :query, :display_name => users(:normal_user).display_name
assert_response :success, "can't get changesets by user name"
- assert_changesets [1,3,6,8]
+ assert_changesets [1, 3, 6, 8]
# check that the correct error is given when we provide both UID and name
get :query, :user => users(:normal_user).id, :display_name => users(:normal_user).display_name
assert_response :success, "can't get changesets by user and open"
assert_changesets [1]
- get :query, :time => '2007-12-31'
+ get :query, :time => "2007-12-31"
assert_response :success, "can't get changesets by time-since"
- assert_changesets [1,2,4,5,6]
+ assert_changesets [1, 2, 4, 5, 6]
- get :query, :time => '2008-01-01T12:34Z'
+ get :query, :time => "2008-01-01T12:34Z"
assert_response :success, "can't get changesets by time-since with hour"
- assert_changesets [1,2,4,5,6]
+ assert_changesets [1, 2, 4, 5, 6]
- get :query, :time => '2007-12-31T23:59Z,2008-01-01T00:01Z'
+ get :query, :time => "2007-12-31T23:59Z,2008-01-01T00:01Z"
assert_response :success, "can't get changesets by time-range"
- assert_changesets [1,5,6]
+ assert_changesets [1, 5, 6]
- get :query, :open => 'true'
+ get :query, :open => "true"
assert_response :success, "can't get changesets by open-ness"
- assert_changesets [1,2,4]
+ assert_changesets [1, 2, 4]
- get :query, :closed => 'true'
+ 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]
- get :query, :closed => 'true', :user => users(:normal_user).id
+ get :query, :closed => "true", :user => users(:normal_user).id
assert_response :success, "can't get changesets by closed-ness and user"
- assert_changesets [3,6,8]
+ assert_changesets [3, 6, 8]
- get :query, :closed => 'true', :user => users(:public_user).id
+ get :query, :closed => "true", :user => users(:public_user).id
assert_response :success, "can't get changesets by closed-ness and user"
assert_changesets [7]
- get :query, :changesets => '1,2,3'
+ get :query, :changesets => "1,2,3"
assert_response :success, "can't get changesets by id (as comma-separated string)"
- assert_changesets [1,2,3]
+ assert_changesets [1, 2, 3]
- get :query, :changesets => ''
+ get :query, :changesets => ""
assert_response :bad_request, "should be a bad request since changesets is empty"
end
# check that errors are returned if garbage is inserted
# into query strings
def test_query_invalid
- [ "abracadabra!",
- "1,2,3,F",
- ";drop table users;"
- ].each do |bbox|
+ ["abracadabra!",
+ "1,2,3,F",
+ ";drop table users;"
+ ].each do |bbox|
get :query, :bbox => bbox
assert_response :bad_request, "'#{bbox}' isn't a bbox"
end
- [ "now()",
- "00-00-00",
- ";drop table users;",
- ",",
- "-,-"
- ].each do |time|
+ ["now()",
+ "00-00-00",
+ ";drop table users;",
+ ",",
+ "-,-"
+ ].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|
+ ["me",
+ "foobar",
+ "-1",
+ "0"
+ ].each do |uid|
get :query, :user => uid
assert_response :bad_request, "'#{uid}' isn't a valid user ID"
end
changeset = changesets(:normal_user_first_change)
new_changeset = changeset.to_xml
new_tag = XML::Node.new "tag"
- new_tag['k'] = "tagtesting"
- new_tag['v'] = "valuetesting"
+ new_tag["k"] = "tagtesting"
+ new_tag["v"] = "valuetesting"
new_changeset.find("//osm/changeset").first << new_tag
content new_changeset
put :update, :id => 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
changeset = changesets(:public_user_first_change)
new_changeset = changeset.to_xml
new_tag = XML::Node.new "tag"
- new_tag['k'] = "tagtesting"
- new_tag['v'] = "valuetesting"
+ new_tag["k"] = "tagtesting"
+ new_tag["v"] = "valuetesting"
new_changeset.find("//osm/changeset").first << new_tag
content new_changeset
changeset = changesets(:normal_user_first_change)
new_changeset = changeset.to_xml
new_tag = XML::Node.new "tag"
- new_tag['k'] = "testing"
- new_tag['v'] = "testing"
+ new_tag["k"] = "testing"
+ new_tag["v"] = "testing"
new_changeset.find("//osm/changeset").first << new_tag
content new_changeset
# loop until we fill the changeset with nodes
offset.times do |i|
- node_xml['lat'] = rand.to_s
- node_xml['lon'] = rand.to_s
- node_xml['version'] = (i+1).to_s
+ node_xml["lat"] = rand.to_s
+ node_xml["lon"] = rand.to_s
+ node_xml["version"] = (i + 1).to_s
content node_doc
put :update, :id => node_id
end
# trying again should fail
- node_xml['lat'] = rand.to_s
- node_xml['lon'] = rand.to_s
- node_xml['version'] = offset.to_s
+ node_xml["lat"] = rand.to_s
+ node_xml["lon"] = rand.to_s
+ node_xml["version"] = offset.to_s
content node_doc
put :update, :id => node_id
##
# This should display the last 20 changesets closed.
def test_list
- get :list, {:format => "html"}
+ get :list, :format => "html"
assert_response :success
assert_template "history"
assert_template :layout => "map"
assert_select "h2", :text => "Changesets", :count => 1
- get :list, {:format => "html", :list => '1', :bbox => '-180,-90,90,180'}
+ get :list, :format => "html", :list => "1", :bbox => "-180,-90,90,180"
assert_response :success
assert_template "list"
- changesets = Changeset.
- where("num_changes > 0 and min_lon is not null").
- order(:created_at => :desc).
- limit(20)
+ 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
+ changesets.each do |_changeset|
+ # FIXME: this test needs rewriting - test for table contents
end
end
##
# This should display the last 20 changesets closed.
def test_list_xhr
- xhr :get, :list, {:format => "html"}
+ xhr :get, :list, :format => "html"
assert_response :success
assert_template "history"
assert_template :layout => "xhr"
assert_select "h2", :text => "Changesets", :count => 1
- get :list, {:format => "html", :list => '1', :bbox => '-180,-90,90,180'}
+ get :list, :format => "html", :list => "1", :bbox => "-180,-90,90,180"
assert_response :success
assert_template "list"
- changesets = Changeset.
- where("num_changes > 0 and min_lon is not null").
- order(:created_at => :desc).
- limit(20)
+ 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
+ changesets.each do |_changeset|
+ # FIXME: this test needs rewriting - test for table contents
end
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}
+ 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
+ # FIXME: need to add more checks to see which if edits are actually shown if your data is public
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"}
+ get :list, :format => "html", :display_name => "Some random user"
assert_response :not_found
- assert_template 'user/no_such_user'
+ assert_template "user/no_such_user"
end
##
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
+ changesets.each do |_changeset|
+ # FIXME: this test needs rewriting - test for feed contents
end
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
+ # FIXME: need to add more checks to see which if edits are actually shown if your data is public
end
##
# 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, :format => "atom", :display_name => "Some random user"
assert_response :not_found
end
##
# create comment success
def test_create_comment_success
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
- assert_difference('ChangesetComment.count') do
- post :comment, { :id => changesets(:normal_user_closed_change).id, :text => 'This is a comment' }
+ assert_difference("ChangesetComment.count") do
+ post :comment, :id => changesets(:normal_user_closed_change).id, :text => "This is a comment"
end
assert_response :success
end
# create comment fail
def test_create_comment_fail
# unauthorized
- post :comment, { :id => changesets(:normal_user_closed_change).id, :text => 'This is a comment' }
+ post :comment, :id => changesets(:normal_user_closed_change).id, :text => "This is a comment"
assert_response :unauthorized
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
# bad changeset id
- assert_no_difference('ChangesetComment.count') do
- post :comment, { :id => 999111, :text => 'This is a comment' }
+ assert_no_difference("ChangesetComment.count") do
+ post :comment, :id => 999111, :text => "This is a comment"
end
assert_response :not_found
# not closed changeset
- assert_no_difference('ChangesetComment.count') do
- post :comment, { :id => changesets(:normal_user_first_change).id, :text => 'This is a comment' }
+ assert_no_difference("ChangesetComment.count") do
+ post :comment, :id => changesets(:normal_user_first_change).id, :text => "This is a comment"
end
assert_response :conflict
# no text
- assert_no_difference('ChangesetComment.count') do
- post :comment, { :id => changesets(:normal_user_closed_change).id }
+ assert_no_difference("ChangesetComment.count") do
+ post :comment, :id => changesets(:normal_user_closed_change).id
end
assert_response :bad_request
# empty text
- assert_no_difference('ChangesetComment.count') do
- post :comment, { :id => changesets(:normal_user_closed_change).id, :text => '' }
+ assert_no_difference("ChangesetComment.count") do
+ post :comment, :id => changesets(:normal_user_closed_change).id, :text => ""
end
- assert_response :bad_request
+ assert_response :bad_request
end
##
# test subscribe success
def test_subscribe_success
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
changeset = changesets(:normal_user_closed_change)
- assert_difference('changeset.subscribers.count') do
- post :subscribe, { :id => changeset.id }
+ assert_difference("changeset.subscribers.count") do
+ post :subscribe, :id => changeset.id
end
assert_response :success
end
def test_subscribe_fail
# unauthorized
changeset = changesets(:normal_user_closed_change)
- assert_no_difference('changeset.subscribers.count') do
- post :subscribe, { :id => changeset.id }
+ assert_no_difference("changeset.subscribers.count") do
+ post :subscribe, :id => changeset.id
end
assert_response :unauthorized
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
# bad changeset id
- assert_no_difference('changeset.subscribers.count') do
- post :subscribe, { :id => 999111 }
+ assert_no_difference("changeset.subscribers.count") do
+ post :subscribe, :id => 999111
end
assert_response :not_found
# not closed changeset
changeset = changesets(:normal_user_first_change)
- assert_no_difference('changeset.subscribers.count') do
- post :subscribe, { :id => changeset.id }
+ assert_no_difference("changeset.subscribers.count") do
+ post :subscribe, :id => changeset.id
end
assert_response :conflict
# trying to subscribe when already subscribed
changeset = changesets(:normal_user_subscribed_change)
- assert_no_difference('changeset.subscribers.count') do
- post :subscribe, { :id => changeset.id }
+ assert_no_difference("changeset.subscribers.count") do
+ post :subscribe, :id => changeset.id
end
assert_response :conflict
end
##
# test unsubscribe success
def test_unsubscribe_success
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
changeset = changesets(:normal_user_subscribed_change)
- assert_difference('changeset.subscribers.count', -1) do
- post :unsubscribe, { :id => changeset.id }
+ assert_difference("changeset.subscribers.count", -1) do
+ post :unsubscribe, :id => changeset.id
end
assert_response :success
end
def test_unsubscribe_fail
# unauthorized
changeset = changesets(:normal_user_closed_change)
- assert_no_difference('changeset.subscribers.count') do
- post :unsubscribe, { :id => changeset.id }
+ assert_no_difference("changeset.subscribers.count") do
+ post :unsubscribe, :id => changeset.id
end
assert_response :unauthorized
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
# bad changeset id
- assert_no_difference('changeset.subscribers.count', -1) do
- post :unsubscribe, { :id => 999111 }
+ assert_no_difference("changeset.subscribers.count", -1) do
+ post :unsubscribe, :id => 999111
end
assert_response :not_found
# not closed changeset
changeset = changesets(:normal_user_first_change)
- assert_no_difference('changeset.subscribers.count', -1) do
- post :unsubscribe, { :id => changeset.id }
+ assert_no_difference("changeset.subscribers.count", -1) do
+ post :unsubscribe, :id => changeset.id
end
assert_response :conflict
# trying to unsubscribe when not subscribed
changeset = changesets(:normal_user_closed_change)
- assert_no_difference('changeset.subscribers.count') do
- post :unsubscribe, { :id => changeset.id }
+ assert_no_difference("changeset.subscribers.count") do
+ post :unsubscribe, :id => changeset.id
end
assert_response :not_found
end
def test_hide_comment_fail
# unauthorized
comment = changeset_comments(:normal_comment_1)
- assert('comment.visible') do
- post :hide_comment, { :id => comment.id }
+ assert("comment.visible") do
+ post :hide_comment, :id => comment.id
assert_response :unauthorized
end
- basic_authorization(users(:public_user).email, 'test')
+ basic_authorization(users(:public_user).email, "test")
# not a moderator
- assert('comment.visible') do
- post :hide_comment, { :id => comment.id }
+ assert("comment.visible") do
+ post :hide_comment, :id => comment.id
assert_response :forbidden
end
- basic_authorization(users(:moderator_user).email, 'test')
+ basic_authorization(users(:moderator_user).email, "test")
# bad comment id
- post :hide_comment, { :id => 999111 }
+ post :hide_comment, :id => 999111
assert_response :not_found
end
def test_hide_comment_success
comment = changeset_comments(:normal_comment_1)
- basic_authorization(users(:moderator_user).email, 'test')
+ basic_authorization(users(:moderator_user).email, "test")
- assert('!comment.visible') do
- post :hide_comment, { :id => comment.id }
+ assert("!comment.visible") do
+ post :hide_comment, :id => comment.id
end
assert_response :success
end
def test_unhide_comment_fail
# unauthorized
comment = changeset_comments(:normal_comment_1)
- assert('comment.visible') do
- post :unhide_comment, { :id => comment.id }
+ assert("comment.visible") do
+ post :unhide_comment, :id => comment.id
assert_response :unauthorized
end
-
- basic_authorization(users(:public_user).email, 'test')
+
+ basic_authorization(users(:public_user).email, "test")
# not a moderator
- assert('comment.visible') do
- post :unhide_comment, { :id => comment.id }
+ assert("comment.visible") do
+ post :unhide_comment, :id => comment.id
assert_response :forbidden
end
- basic_authorization(users(:moderator_user).email, 'test')
+ basic_authorization(users(:moderator_user).email, "test")
# bad comment id
- post :unhide_comment, { :id => 999111 }
+ post :unhide_comment, :id => 999111
assert_response :not_found
end
def test_unhide_comment_success
comment = changeset_comments(:normal_comment_1)
- basic_authorization(users(:moderator_user).email, 'test')
+ basic_authorization(users(:moderator_user).email, "test")
- assert('!comment.visible') do
- post :unhide_comment, { :id => comment.id }
+ assert("!comment.visible") do
+ post :unhide_comment, :id => comment.id
end
assert_response :success
end
##
# test comments feed
def test_comments_feed
- get :comments_feed, {:format => "rss"}
+ get :comments_feed, :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
end
end
- get :comments_feed, { :id => changesets(:normal_user_closed_change), :format => "rss"}
+ get :comments_feed, :id => changesets(:normal_user_closed_change), :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
# check the bbox
doc = XML::Parser.string(@response.body).parse
changeset = doc.find("//osm/changeset").first
- assert_equal bbox[0], changeset['min_lon'].to_f, "min lon"
- assert_equal bbox[1], changeset['min_lat'].to_f, "min lat"
- assert_equal bbox[2], changeset['max_lon'].to_f, "max lon"
- assert_equal bbox[3], changeset['max_lat'].to_f, "max lat"
+ assert_equal bbox[0], changeset["min_lon"].to_f, "min lon"
+ assert_equal bbox[1], changeset["min_lat"].to_f, "min lat"
+ assert_equal bbox[2], changeset["max_lon"].to_f, "max lon"
+ assert_equal bbox[3], changeset["max_lat"].to_f, "max lat"
end
##
# update the changeset_id of a way element
def update_changeset(xml, changeset_id)
- xml_attr_rewrite(xml, 'changeset', changeset_id)
+ xml_attr_rewrite(xml, "changeset", changeset_id)
end
##
# update an attribute in a way element
def xml_attr_rewrite(xml, name, value)
xml.find("//osm/way").first[name] = value.to_s
- return xml
+ xml
end
end
projects / rails.git / blobdiff