aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-10-09 01:20:36 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-10-09 01:20:36 +0000
commitbc85e6ac4c6c11e9f0009bded6cb31940f80e803 (patch)
tree837ae8dca35eb5203a1134d3cca01a4459510479 /actionpack/test/controller
parent5d1edc55a8462f3fa88c9801ceb01c60db50884b (diff)
downloadrails-bc85e6ac4c6c11e9f0009bded6cb31940f80e803.tar.gz
rails-bc85e6ac4c6c11e9f0009bded6cb31940f80e803.tar.bz2
rails-bc85e6ac4c6c11e9f0009bded6cb31940f80e803.zip
Rename test assertion to prevent shadowing. Closes #6306.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5252 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/routing_test.rb2
1 files changed, 1 insertions, 1 deletions
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" }