diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-09-24 17:07:54 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-09-27 11:19:24 -0300 |
| commit | 50decfbc0e2e58961cc3665710922860d38ee2fb (patch) | |
| tree | cdfa4a91ede3cc11456d77a27cd61e2a23178742 /actionpack/lib/action_dispatch/testing/assertions/routing.rb | |
| parent | 023c2020b3f94dadb86ead782c07006732d9ab56 (diff) | |
| download | rails-50decfbc0e2e58961cc3665710922860d38ee2fb.tar.gz rails-50decfbc0e2e58961cc3665710922860d38ee2fb.tar.bz2 rails-50decfbc0e2e58961cc3665710922860d38ee2fb.zip | |
_routes must be inside @controller conditional.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions/routing.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 0cdc69760b..1390b74a95 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -148,6 +148,7 @@ module ActionDispatch old_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new if defined?(@controller) && @controller old_controller, @controller = @controller, @controller.clone + _routes = @routes # Unfortunately, there is currently an abstraction leak between AC::Base # and AV::Base which requires having the URL helpers in both AC and AV. @@ -160,7 +161,6 @@ module ActionDispatch include _routes.url_helpers end end - _routes = @routes yield @routes ensure @routes = old_routes |