Remove unused

[rails.git] / test / functional / browse_controller_test.rb

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 9ba8dd8f0dab22dd26ecbeddfc03e88d57e32c37..0f1ff68559fca73ac45f4c823ade86925a79b6c1 100644 (file)
--- 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" }
@@ -39,6 +35,10 @@ class BrowseControllerTest < ActionController::TestCase
       { :path => "/browse/changeset/1", :method => :get },
       { :controller => "browse", :action => "changeset", :id => "1" }
     )
+    assert_routing(
+      { :path => "/browse/note/1", :method => :get },
+      { :controller => "browse", :action => "note", :id => "1" }
+    )
   end
 
   def test_start
@@ -74,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.
   #
@@ -122,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}