Revert "Merge pull request rails#51614 from gmcgibbon/defer_route_drawing"

This reverts commit e97db3b, reversing
changes made to a27a175.

This is breaking application routes when running without eager load enabled.

Author: eileencodes

actionpack/lib/action_dispatch/testing/assertions/routing.rb

@@ -46,9 +46,7 @@ def with_routing(&block)
           def create_routes
             app = self.app
             routes = ActionDispatch::Routing::RouteSet.new
-            middleware = app.config.middleware.dup
-            middleware.delete(Rails::Rack::LoadRoutes) if defined?(Rails::Rack::LoadRoutes)
-            rack_app = middleware.build(routes)
+            rack_app = app.config.middleware.build(routes)
             https = integration_session.https?
             host = integration_session.host
 

actionpack/test/dispatch/routing_assertions_test.rb

@@ -4,11 +4,7 @@
 require "rails/engine"
 require "controller/fake_controllers"
 
-class SecureArticlesController < ArticlesController
-  def index
-    render(inline: "")
-  end
-end
+class SecureArticlesController < ArticlesController; end
 class BlockArticlesController < ArticlesController; end
 class QueryArticlesController < ArticlesController; end
 
@@ -280,20 +276,6 @@ class RoutingAssertionsControllerTest < ActionController::TestCase
 
   class WithRoutingTest < ActionController::TestCase
     include RoutingAssertionsSharedTests::WithRoutingSharedTests
-
-    test "with_routing routes are reachable" do
-      @controller = SecureArticlesController.new
-
-      with_routing do |routes|
-        routes.draw do
-          get :new_route, to: "secure_articles#index"
-        end
-
-        get :index
-
-        assert_predicate(response, :ok?)
-      end
-    end
   end
 end
 
@@ -313,18 +295,6 @@ class RoutingAssertionsIntegrationTest < ActionDispatch::IntegrationTest
 
   class WithRoutingTest < ActionDispatch::IntegrationTest
     include RoutingAssertionsSharedTests::WithRoutingSharedTests
-
-    test "with_routing routes are reachable" do
-      with_routing do |routes|
-        routes.draw do
-          get :new_route, to: "secure_articles#index"
-        end
-
-        get "/new_route"
-
-        assert_predicate(response, :ok?)
-      end
-    end
   end
 
   class WithRoutingSettingsTest < ActionDispatch::IntegrationTest

railties/lib/rails/application.rb

@@ -9,7 +9,6 @@
 require "active_support/encrypted_configuration"
 require "active_support/hash_with_indifferent_access"
 require "active_support/configuration_file"
-require "active_support/parameter_filter"
 require "rails/engine"
 require "rails/autoloaders"
 

railties/lib/rails/application/default_middleware_stack.rb

@@ -62,8 +62,6 @@ def build_stack
             middleware.use ::ActionDispatch::ActionableExceptions
           end
 
-          middleware.use ::Rails::Rack::LoadRoutes, app.routes_reloader unless app.config.eager_load
-
           if config.reloading_enabled?
             middleware.use ::ActionDispatch::Reloader, app.reloader
           end

railties/lib/rails/application/finisher.rb

@@ -159,6 +159,7 @@ def self.complete(_state)
       initializer :set_routes_reloader_hook do |app|
         reloader = routes_reloader
         reloader.eager_load = app.config.eager_load
+        reloader.execute
         reloaders << reloader
 
         app.reloader.to_run do
@@ -176,12 +177,7 @@ def self.complete(_state)
           ActiveSupport.run_load_hooks(:after_routes_loaded, self)
         end
 
-        if reloader.eager_load
-          reloader.execute
-          ActiveSupport.run_load_hooks(:after_routes_loaded, self)
-        elsif reloader.loaded
-          ActiveSupport.run_load_hooks(:after_routes_loaded, self)
-        end
+        ActiveSupport.run_load_hooks(:after_routes_loaded, self)
       end
 
       # Set clearing dependencies after the finisher hook to ensure paths

railties/lib/rails/application/routes_reloader.rb

@@ -7,7 +7,7 @@ class Application
     class RoutesReloader
       include ActiveSupport::Callbacks
 
-      attr_reader :route_sets, :paths, :external_routes, :loaded
+      attr_reader :route_sets, :paths, :external_routes
       attr_accessor :eager_load
       attr_writer :run_after_load_paths # :nodoc:
       delegate :execute_if_updated, :execute, :updated?, to: :updater
@@ -17,11 +17,9 @@ def initialize
         @route_sets = []
         @external_routes = []
         @eager_load = false
-        @loaded = false
       end
 
       def reload!
-        @loaded = true
         clear!
         load_paths
         finalize!
@@ -30,13 +28,6 @@ def reload!
         revert
       end
 
-      def execute_unless_loaded
-        unless @loaded
-          execute
-          true
-        end
-      end
-
     private
       def updater
         @updater ||= begin

railties/lib/rails/commands/routes/routes_command.rb

@@ -23,7 +23,6 @@ def invoke_command(*)
       desc "routes", "List all the defined routes"
       def perform(*)
         boot_application!
-        Rails.application.routes_reloader.execute_unless_loaded
         require "action_dispatch/routing/inspector"
 
         say inspector.format(formatter, routes_filter)

railties/lib/rails/commands/unused_routes/unused_routes_command.rb

@@ -41,7 +41,6 @@ def action_missing?
 
       def perform(*)
         boot_application!
-        Rails.application.routes_reloader.execute_unless_loaded
         require "action_dispatch/routing/inspector"
 
         say(inspector.format(formatter, routes_filter))

railties/lib/rails/engine.rb

@@ -349,7 +349,6 @@ module Rails
   #   config.railties_order = [Blog::Engine, :main_app, :all]
   class Engine < Railtie
     autoload :Configuration, "rails/engine/configuration"
-    autoload :RouteSet,      "rails/engine/route_set"
 
     class << self
       attr_accessor :called_from, :isolated
@@ -544,7 +543,7 @@ def env_config
     # Defines the routes for this engine. If a block is given to
     # routes, it is appended to the engine.
     def routes(&block)
-      @routes ||= RouteSet.new_with_config(config)
+      @routes ||= ActionDispatch::Routing::RouteSet.new_with_config(config)
       @routes.append(&block) if block_given?
       @routes
     end