aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-12-06 20:36:40 -0600
committerJoshua Peek <josh@joshpeek.com>2009-12-06 20:40:07 -0600
commit48127c637c3cc0892d49f90a05b0034b9a625d73 (patch)
tree4268f91a442ebfda712858c775f456fba46f198e /actionpack/test/controller
parent63e435955e16cf976a8382e757529f4597549f2e (diff)
downloadrails-48127c637c3cc0892d49f90a05b0034b9a625d73.tar.gz
rails-48127c637c3cc0892d49f90a05b0034b9a625d73.tar.bz2
rails-48127c637c3cc0892d49f90a05b0034b9a625d73.zip
Deprecate recalling generation params when the defaults are nil
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/routing_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 4382227b47..ff8dfc2573 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1668,9 +1668,7 @@ class RouteSetTest < ActiveSupport::TestCase
assert_equal("/blog/2006/07/25", set.generate({:day => 25}, last_request))
assert_equal("/blog/2005", set.generate({:year => 2005}, last_request))
assert_equal("/blog/show/123", set.generate({:action => "show" , :id => 123}, last_request))
- pending do
- assert_equal("/blog/2006/07/28", set.generate({:year => 2006}, last_request))
- end
+ assert_equal("/blog/2006", set.generate({:year => 2006}, last_request))
assert_equal("/blog/2006", set.generate({:year => 2006, :month => nil}, last_request))
end