X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2d937f94d55c0b8f94b024f579a78271d85fbe9a..e9cb282712bdd5f0e103a33c35c7ef3961506ab7:/test/functional/changeset_controller_test.rb diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb index 3d963b471..9ed9f2959 100644 --- a/test/functional/changeset_controller_test.rb +++ b/test/functional/changeset_controller_test.rb @@ -4,6 +4,79 @@ require 'changeset_controller' class ChangesetControllerTest < ActionController::TestCase api_fixtures + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/changeset/create", :method => :put }, + { :controller => "changeset", :action => "create" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1/upload", :method => :post }, + { :controller => "changeset", :action => "upload", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1/download", :method => :get }, + { :controller => "changeset", :action => "download", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1/expand_bbox", :method => :post }, + { :controller => "changeset", :action => "expand_bbox", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1", :method => :get }, + { :controller => "changeset", :action => "read", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1", :method => :put }, + { :controller => "changeset", :action => "update", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changeset/1/close", :method => :put }, + { :controller => "changeset", :action => "close", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/changesets", :method => :get }, + { :controller => "changeset", :action => "query" } + ) + assert_routing( + { :path => "/user/name/edits", :method => :get }, + { :controller => "changeset", :action => "list", :display_name => "name" } + ) + assert_routing( + { :path => "/user/name/edits/feed", :method => :get }, + { :controller => "changeset", :action => "feed", :display_name => "name", :format => :atom } + ) + assert_routing( + { :path => "/browse/friends", :method => :get }, + { :controller => "changeset", :action => "list", :friends => true } + ) + assert_routing( + { :path => "/browse/nearby", :method => :get }, + { :controller => "changeset", :action => "list", :nearby => true } + ) + assert_routing( + { :path => "/browse/changesets", :method => :get }, + { :controller => "changeset", :action => "list" } + ) + assert_routing( + { :path => "/browse/changesets/feed", :method => :get }, + { :controller => "changeset", :action => "feed", :format => :atom } + ) + assert_recognizes( + { :controller => "changeset", :action => "list" }, + { :path => "/browse", :method => :get } + ) + assert_recognizes( + { :controller => "changeset", :action => "list" }, + { :path => "/history", :method => :get } + ) + assert_recognizes( + { :controller => "changeset", :action => "feed", :format => :atom }, + { :path => "/history/feed", :method => :get } + ) + end + # ----------------------- # Test simple changeset creation # ----------------------- @@ -99,8 +172,12 @@ class ChangesetControllerTest < ActionController::TestCase # check that a changeset that doesn't exist returns an appropriate message def test_read_not_found [0, -32, 233455644, "afg", "213"].each do |id| - get :read, :id => id - assert_response :not_found, "should get a not found" + begin + get :read, :id => id + assert_response :not_found, "should get a not found" + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end end end @@ -161,15 +238,23 @@ class ChangesetControllerTest < ActionController::TestCase # First try to do it with no auth cs_ids.each do |id| - put :close, :id => id - assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" + begin + put :close, :id => id + assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end end # Now try with auth basic_authorization users(:public_user).email, "test" cs_ids.each do |id| - put :close, :id => id - assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" + begin + put :close, :id => id + assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" + rescue ActionController::RoutingError => ex + assert_match /No route matches/, ex.to_s + end end end @@ -489,7 +574,7 @@ EOF post :upload, :id => 2 assert_response :precondition_failed, "shouldn't be able to upload a invalid deletion diff: #{@response.body}" - assert_equal "Precondition failed: Way 3 still used by relation 1.", @response.body + assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body # check that nothing was, in fact, deleted assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible @@ -1282,10 +1367,10 @@ EOF # 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).id}][visible=#{nodes(:used_node_2).visible?}][version=#{nodes(:used_node_2).version}]" do + assert_select "create>node[id=#{nodes(:used_node_2).node_id}][visible=#{nodes(:used_node_2).visible?}][version=#{nodes(:used_node_2).version}]" do assert_select "tag[k=#{node_tags(:t3).k}][v=#{node_tags(:t3).v}]" end - assert_select "create>node[id=#{nodes(:visible_node).id}]" + assert_select "create>node[id=#{nodes(:visible_node).node_id}]" end end @@ -1462,6 +1547,14 @@ EOF get :query, :closed => 'true' assert_response :success, "can't get changesets by closed-ness" assert_changesets [3,5,6,7] + + 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] + + get :query, :closed => 'true', :user => users(:public_user).id + assert_response :success, "can't get changesets by closed-ness and user" + assert_changesets [7] end ## @@ -1635,14 +1728,14 @@ EOF ## # This should display the last 20 changesets closed. def test_list - changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['min_lat IS NOT NULL'], :limit=> 20) + changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20) assert changesets.size <= 20 get :list, {:format => "html"} assert_response :success assert_template "list" # Now check that all 20 (or however many were returned) changesets are in the html assert_select "h1", :text => "Changesets", :count => 1 - assert_select "table[id='changeset_list'] tr", :count => changesets.size + 1 + assert_select "div[id='changeset_list'] ul", :count => changesets.size changesets.each do |changeset| # FIXME this test needs rewriting - test for table contents end @@ -1665,7 +1758,56 @@ EOF assert_response :not_found assert_template 'user/no_such_user' end + + ## + # This should display the last 20 changesets closed. + def test_feed + changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20) + assert changesets.size <= 20 + 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 + 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} + assert_response :success + assert_template "changeset/_user" + ## 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"} + assert_response :not_found + end + ## + # check that the changeset download for a changeset with a redacted + # element in it doesn't contain that element. + def test_diff_download_redacted + changeset_id = changesets(:public_user_first_change).id + + get :download, :id => changeset_id + assert_response :success + + assert_select "osmChange", 1 + # this changeset contains node 17 in versions 1 & 2, but 1 should + # be hidden. + assert_select "osmChange node[id=17]", 1 + assert_select "osmChange node[id=17][version=1]", 0 + end + #------------------------------------------------------------ # utility functions #------------------------------------------------------------