Merge pull request rails#53522 from nashby/routes-reload

Do not mark routes as loaded during `RoutesReloader#reload!` call.

Author: rafaelfranca

railties/lib/rails/application/routes_reloader.rb

@@ -10,7 +10,7 @@ class RoutesReloader
       attr_reader :route_sets, :paths, :external_routes, :loaded
       attr_accessor :eager_load
       attr_writer :run_after_load_paths # :nodoc:
-      delegate :execute_if_updated, :execute, :updated?, to: :updater
+      delegate :execute_if_updated, :updated?, to: :updater
 
       def initialize
         @paths      = []
@@ -21,7 +21,6 @@ def initialize
       end
 
       def reload!
-        @loaded = true
         clear!
         load_paths
         finalize!
@@ -30,6 +29,11 @@ def reload!
         revert
       end
 
+      def execute
+        @loaded = true
+        updater.execute
+      end
+
       def execute_unless_loaded
         unless @loaded
           execute

railties/test/application/routing_test.rb

@@ -314,6 +314,31 @@ def index
       assert_equal "WIN", last_response.body
     end
 
+    test "routes appending blocks after reload" do
+      app_file "config/routes.rb", <<-RUBY
+        Rails.application.routes.draw do
+          get ':controller/:action'
+        end
+      RUBY
+
+      add_to_config <<-R
+        config.before_eager_load do |app|
+          app.reload_routes!
+        end
+
+        config.after_initialize do |app|
+          app.routes.append do
+            get '/win' => lambda { |e| [200, {'Content-Type'=>'text/plain'}, ['WIN']] }
+          end
+        end
+      R
+
+      app "production"
+
+      get "/win"
+      assert_equal "WIN", last_response.body
+    end
+
     test "routes drawing from config/routes" do
       app_file "config/routes.rb", <<-RUBY
         AppTemplate::Application.routes.draw do