Revert "Merge pull request #33970 from rails/eager-url-helpers"

Until #34050 can be resolved

This reverts commit 7f870a5ba2aa9177aa4a0e03a9d027928ba60e49, reversing
changes made to 6556898884d636c59baae008e42783b8d3e16440.

2 files changed, 9 insertions, 10 deletions

diff --git a/actionpack/test/dispatch/routing/ipv6_redirect_test.rb b/actionpack/test/dispatch/routing/ipv6_redirect_test.rb
index fb423d2951..31559bffc7 100644
--- a/actionpack/test/dispatch/routing/ipv6_redirect_test.rb
+++ b/actionpack/test/dispatch/routing/ipv6_redirect_test.rb
@@ -4,11 +4,6 @@ require "abstract_unit"
 
 class IPv6IntegrationTest < ActionDispatch::IntegrationTest
   Routes = ActionDispatch::Routing::RouteSet.new
-  Routes.draw do
-    get "/",    to: "bad_route_request#index", as: :index
-    get "/foo", to: "bad_route_request#foo", as: :foo
-  end
-
   include Routes.url_helpers
 
   class ::BadRouteRequestController < ActionController::Base
@@ -22,6 +17,11 @@ class IPv6IntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
+  Routes.draw do
+    get "/",    to: "bad_route_request#index", as: :index
+    get "/foo", to: "bad_route_request#foo", as: :foo
+  end
+
   def _routes
     Routes
   end
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index b0096d26be..aef9351de1 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -4,13 +4,16 @@ require "abstract_unit"
 
 module TestUrlGeneration
   class WithMountPoint < ActionDispatch::IntegrationTest
+    Routes = ActionDispatch::Routing::RouteSet.new
+    include Routes.url_helpers
+
     class ::MyRouteGeneratingController < ActionController::Base
+      include Routes.url_helpers
       def index
         render plain: foo_path
       end
     end
 
-    Routes = ActionDispatch::Routing::RouteSet.new
     Routes.draw do
       get "/foo", to: "my_route_generating#index", as: :foo
 
@@ -19,10 +22,6 @@ module TestUrlGeneration
       mount MyRouteGeneratingController.action(:index), at: "/bar"
     end
 
-    class ::MyRouteGeneratingController
-      include Routes.url_helpers
-    end
-
     APP = build_app Routes
 
     def _routes