diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-03-18 15:52:43 -0700 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-18 15:52:43 -0700 |
commit | 71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b (patch) | |
tree | 4e4a89ceca056d7ee4fcf329ecb56bbc0547d553 /actionpack/lib/action_dispatch/testing/assertions | |
parent | 523d0f3700f5bb68cdd3d549eaad63d8a88c2aef (diff) | |
download | rails-71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b.tar.gz rails-71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b.tar.bz2 rails-71c9337f45f9c5461cbc6ddf6cab764ad0f82c3b.zip |
All tests pass without memoizing view_context
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/assertions')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index eb28cd5107..de833bb3ca 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -154,15 +154,14 @@ module ActionDispatch # TODO: Make this unnecessary if @controller @controller.singleton_class.send(:include, @router.url_helpers) - @controller.class._helper_serial += 1 - @controller.view_context.singleton_class.send(:include, @router.url_helpers) + @controller.class._helper_serial = AbstractController::Helpers.next_serial + 1 end yield @router ensure @router = old_routes if @controller @controller = old_controller - @controller.class._helper_serial += 1 if @controller + @controller.class._helper_serial = AbstractController::Helpers.next_serial + 1 if @controller end end |