Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions railties/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* Prevent the internal development welcome route from being duplicated on route reloads.

*Elliot Temple*

* Remove `new_framework_defaults` during `app:update` when `config.load_defaults`
already targets the current Rails version.

Expand Down
8 changes: 6 additions & 2 deletions railties/lib/rails/application/finisher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,13 @@ def self.complete(_state)
get ".well-known/appspecific/com.chrome.devtools.json" => "rails/devtools#show", internal: true
end

welcome_route_appended = false
routes_reloader.run_after_load_paths = -> do
app.routes.append do
get "/" => "rails/welcome#index", internal: true
unless welcome_route_appended
app.routes.append do
get "/" => "rails/welcome#index", internal: true
end
welcome_route_appended = true
end
end
end
Expand Down
11 changes: 11 additions & 0 deletions railties/test/application/routing_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ def teardown
assert_equal 200, last_response.status
end

test "rails/welcome is not duplicated when routes reload in development" do
app("development")

3.times { Rails.application.reload_routes! }

welcome_routes = Rails.application.routes.routes.select do |route|
route.defaults[:controller] == "rails/welcome" && route.defaults[:action] == "index"
end
assert_equal 1, welcome_routes.size
end

test "rails/info in development" do
app("development")
get "/rails/info"
Expand Down