X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/62b6d159672ad29344c7b7074a37d23b16dbb5d9..7da8a5a1a82c759ff08a7cf434bb1e51158ff7af:/test/functional/browse_controller_test.rb diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index a36fa3703..df0bb0e41 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -4,70 +4,134 @@ require 'browse_controller' class BrowseControllerTest < ActionController::TestCase api_fixtures - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/browse/start", :method => :get }, + { :controller => "browse", :action => "start" } + ) + assert_routing( + { :path => "/browse/node/1", :method => :get }, + { :controller => "browse", :action => "node", :id => "1" } + ) + assert_routing( + { :path => "/browse/node/1/history", :method => :get }, + { :controller => "browse", :action => "node_history", :id => "1" } + ) + assert_routing( + { :path => "/browse/way/1", :method => :get }, + { :controller => "browse", :action => "way", :id => "1" } + ) + assert_routing( + { :path => "/browse/way/1/history", :method => :get }, + { :controller => "browse", :action => "way_history", :id => "1" } + ) + assert_routing( + { :path => "/browse/relation/1", :method => :get }, + { :controller => "browse", :action => "relation", :id => "1" } + ) + assert_routing( + { :path => "/browse/relation/1/history", :method => :get }, + { :controller => "browse", :action => "relation_history", :id => "1" } + ) + assert_routing( + { :path => "/browse/changeset/1", :method => :get }, + { :controller => "browse", :action => "changeset", :id => "1" } + ) end - def content(c) - @request.env["RAW_POST_DATA"] = c.to_s - end - - # We need to load the home page, then activate the start rjs method - # and finally check that the new panel has loaded. def test_start - - end - - # This should display the last 20 changesets closed. - def test_index - @changesets = Changeset.find(:all, :order => "closed_at DESC", :limit=> 20) - assert @changesets.size <= 20 - get :index + xhr :get, :start assert_response :success - assert_template "index" - # Now check that all 20 (or however many were returned) changesets are in the html - assert_select "h2", :text => "#{@changesets.size} Recently Closed Changesets", :count => 1 - assert_select "ul[id='recently_changed'] li a", :count => @changesets.size - @changesets.each do |changeset| - if changeset.user.data_public? - user = changeset.user.display_name - else - user = "(anonymous)" - end - - cmt = changeset.tags_as_hash['comment'].to_s - cmt = "(no comment)" if cmt.length == 0 - text = "#{changeset.id} by #{user} - #{cmt}" - assert_select "ul[id='recently_changed'] li a[href=/browse/changeset/#{changeset.id}]", :text => text - end end - # Test reading a relation def test_read_relation - + browse_check 'relation', relations(:visible_relation).relation_id end def test_read_relation_history - + browse_check 'relation_history', relations(:visible_relation).relation_id end def test_read_way - + browse_check 'way', ways(:visible_way).way_id end def test_read_way_history - + browse_check 'way_history', ways(:visible_way).way_id end def test_read_node - + browse_check 'node', nodes(:visible_node).node_id end def test_read_node_history - + browse_check 'node_history', nodes(:visible_node).node_id end def test_read_changeset + browse_check 'changeset', changesets(:normal_user_first_change).id + end + + ## + # Methods to check redaction. + # + # note that these are presently highly reliant on the structure of the + # page for the selection tests, which doesn't work out particularly + # well if that structure changes. so... if you change the page layout + # then please make it more easily (and robustly) testable! + ## + def test_redacted_node_history + get :node_history, :id => nodes(:redacted_node_redacted_version).node_id + assert_response :success + assert_template 'node_history' + # there are 2 revisions of the redacted node, but only one + # should be showing up here. + assert_select "body div[id=content] table[class=browse_details]", 1 + assert_select "body div[id=content] table[class=browse_details][id=1]", 0 + end + + def test_redacted_way_history + get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id + assert_response :success + assert_template 'way_history' + + # there are 4 revisions of the redacted way, but only 2 + # should be showing up here. + assert_select "body div[id=content] table[class=browse_details]", 2 + # redacted revisions are 2 & 3 + assert_select "body div[id=content] table[class=browse_details][id=2]", 0 + assert_select "body div[id=content] table[class=browse_details][id=3]", 0 + end + + def test_redacted_relation_history + get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id + assert_response :success + assert_template 'relation_history' + + # there are 4 revisions of the redacted relation, but only 2 + # should be showing up here. + assert_select "body div[id=content] table[class=browse_details]", 2 + # redacted revisions are 2 & 3 + assert_select "body div[id=content] table[class=browse_details][id=2]", 0 + assert_select "body div[id=content] table[class=browse_details][id=3]", 0 + end + + # This is a convenience method for most of the above checks + # First we check that when we don't have an id, it will correctly return a 404 + # then we check that we get the correct 404 when a non-existant id is passed + # then we check that it will get a successful response, when we do pass an id + def browse_check(type, id) + get type + assert_response :not_found + assert_template 'not_found' + get type, {:id => -10} # we won't have an id that's negative + assert_response :not_found + assert_template 'not_found' + get type, {:id => id} + assert_response :success + assert_template type end end