aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-10-16 14:32:11 +0000
committerJamis Buck <jamis@37signals.com>2006-10-16 14:32:11 +0000
commitb5ec0fe3133531f0cce5b8707f2ac831fdc57bea (patch)
treedc0d09fe7a589ad5172ff5817a0a2a35b5cfe356 /actionpack/test/controller
parent497b5dcf1965dea95bc59a00214e14c42dba69cc (diff)
downloadrails-b5ec0fe3133531f0cce5b8707f2ac831fdc57bea.tar.gz
rails-b5ec0fe3133531f0cce5b8707f2ac831fdc57bea.tar.bz2
rails-b5ec0fe3133531f0cce5b8707f2ac831fdc57bea.zip
Fix broken assert_generates when extra keys are being checked.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5309 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/test_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 95c75bb744..ee172b25a4 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -310,6 +310,10 @@ HTML
def test_assert_generates
assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
+ assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action"}
+ assert_generates 'controller/action/5', {:controller => "controller", :action => "action", :id => "5", :name => "bob"}, {}, {:name => "bob"}
+ assert_generates 'controller/action/7', {:id => "7", :name => "bob"}, {:controller => "controller", :action => "action"}, {:name => "bob"}
+ assert_generates 'controller/action/7', {:id => "7"}, {:controller => "controller", :action => "action", :name => "bob"}, {}
end
def test_assert_routing