aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-07-15 19:36:19 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-07-15 19:36:19 +0530
commita80e1e437e74409d8b47b0c3b0cc0bc9ba78c190 (patch)
treeabcfc7fcc30c7196cb2b71c7217f91d5a344197b /actionpack
parentaa6f5120a71dd04f54f248b6c60890bca6d82adc (diff)
parent92dcdc590ebb8407e7f53c26d501d169799d0eff (diff)
downloadrails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.tar.gz
rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.tar.bz2
rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/testing/assertions/routing.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 41fa3a4b95..9de545b3c5 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -127,16 +127,13 @@ module ActionDispatch
# with a new RouteSet instance.
#
# The new instance is yielded to the passed block. Typically the block
- # will create some routes using <tt>map.draw { map.connect ... }</tt>:
+ # will create some routes using <tt>set.draw { match ... }</tt>:
#
# with_routing do |set|
- # set.draw do |map|
- # map.connect ':controller/:action/:id'
- # assert_equal(
- # ['/content/10/show', {}],
- # map.generate(:controller => 'content', :id => 10, :action => 'show')
- # end
+ # set.draw do
+ # resources :users
# end
+ # assert_equal "/users", users_path
# end
#
def with_routing