X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7f598ab412674ce5a78da98c54aa2fe2e4a05792..15ff7b9843481dc12a3e1e774c26b1a72dcb7e4b:/test/functional/browse_controller_test.rb diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index 87a3e7489..0f1ff6855 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -7,10 +7,6 @@ class BrowseControllerTest < ActionController::TestCase ## # 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" } @@ -78,6 +74,10 @@ class BrowseControllerTest < ActionController::TestCase browse_check 'changeset', changesets(:normal_user_first_change).id end + def test_read_note + browse_check 'note', notes(:open_note).id + end + ## # Methods to check redaction. # @@ -126,15 +126,17 @@ class BrowseControllerTest < ActionController::TestCase assert_select "body div#content div.browse_details[id=4] div.common", 1 end +private + # 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) - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get type end - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get type, {:id => -10} # we won't have an id that's negative end get type, {:id => id}