RoutingError is now UrlGenerationError

[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 11f51ae5cb9846b196d6798a7e5cbae1a0a3bc52..b320be1e3a2dd584fb7a9b3f0409cc60f53b8e9d 100644 (file)
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -92,9 +92,10 @@ class BrowseControllerTest < ActionController::TestCase
     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] div[class=browse_details]", 1
-    assert_select "body div[id=content] div[class=browse_details][id=1]", 0
+    # should be showing details here.
+    assert_select "body div#content div.browse_details", 2
+    assert_select "body div#content div.browse_details[id=1] div.common", 0
+    assert_select "body div#content div.browse_details[id=2] div.common", 1
   end
 
   def test_redacted_way_history
@@ -103,11 +104,12 @@ class BrowseControllerTest < ActionController::TestCase
     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] div[class=browse_details]", 2
-    # redacted revisions are 2 & 3
-    assert_select "body div[id=content] div[class=browse_details][id=2]", 0
-    assert_select "body div[id=content] div[class=browse_details][id=3]", 0
+    # should be showing details here.
+    assert_select "body div#content div.browse_details", 4
+    assert_select "body div#content div.browse_details[id=1] div.common", 1
+    assert_select "body div#content div.browse_details[id=2] div.common", 0
+    assert_select "body div#content div.browse_details[id=3] div.common", 0
+    assert_select "body div#content div.browse_details[id=4] div.common", 1
   end
 
   def test_redacted_relation_history
@@ -116,11 +118,12 @@ class BrowseControllerTest < ActionController::TestCase
     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] div[class=browse_details]", 2
-    # redacted revisions are 2 & 3
-    assert_select "body div[id=content] div[class=browse_details][id=2]", 0
-    assert_select "body div[id=content] div[class=browse_details][id=3]", 0
+    # should be showing details here.
+    assert_select "body div#content div.browse_details", 4
+    assert_select "body div#content div.browse_details[id=1] div.common", 1
+    assert_select "body div#content div.browse_details[id=2] div.common", 0
+    assert_select "body div#content div.browse_details[id=3] div.common", 0
+    assert_select "body div#content div.browse_details[id=4] div.common", 1
   end
 
   # This is a convenience method for most of the above checks
@@ -128,10 +131,10 @@ class BrowseControllerTest < ActionController::TestCase
   # 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}