diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 007736f2bb..d415fd086a 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Rename test assertion to prevent shadowing. Closes #6306. [psross] + * Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [phallstrom] * Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 [evansj] diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index 1dc61df5fb..dc94e9920d 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1605,7 +1605,7 @@ class RouteSetTest < Test::Unit::TestCase assert_equal "/about", url end - def test_generate_extras + def test_generate set.draw { |map| map.connect ':controller/:action/:id' } args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" } |