Each controller class has it's own view context subclass. This removes the need for ActionView::Base.for_controller

1 files changed, 4 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index de833bb3ca..1bb81ede3b 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -153,15 +153,16 @@ module ActionDispatch
         #
         # TODO: Make this unnecessary
         if @controller
-          @controller.singleton_class.send(:include, @router.url_helpers)
-          @controller.class._helper_serial = AbstractController::Helpers.next_serial + 1
+          @controller.singleton_class.send(:include, _router.url_helpers)
+          @controller.view_context_class = Class.new(@controller.view_context_class) do
+            include _router.url_helpers
+          end
         end
         yield @router
       ensure
         @router = old_routes
         if @controller
           @controller = old_controller
-          @controller.class._helper_serial = AbstractController::Helpers.next_serial + 1 if @controller
         end
       end