X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..0e19a9290d77430dc68479ea469f19fb83ab0fcc:/test/functional/browse_controller_test.rb?ds=sidebyside diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index c4d7a5ae4..2fa594298 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -4,70 +4,52 @@ require 'browse_controller' class BrowseControllerTest < ActionController::TestCase api_fixtures - def basic_authorization(user, pass) - @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}") - 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", :conditions => ['closed_at < ?', DateTime.now], :limit=> 20) - assert @changesets.size <= 20 - get :index + 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) end def test_read_relation_history - + browse_check 'relation_history', relations(:visible_relation) end def test_read_way - + browse_check 'way', ways(:visible_way) end def test_read_way_history - + browse_check 'way_history', ways(:visible_way) end def test_read_node - + browse_check 'node', nodes(:visible_node) end def test_read_node_history - + browse_check 'node_history', nodes(:visible_node) end def test_read_changeset - + browse_check 'changeset', changesets(:normal_user_first_change) + 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, fixture) + 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 => fixture.id} + assert_response :success + assert_template type end end