Merge pull request #23008 from tawan/avoid-multiple-default-paths

Avoid multiple default paths to server.pid file

2 files changed, 12 insertions, 1 deletions

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 45d649ec31..27cbaf360a 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -6,6 +6,8 @@ require 'rails'
 module Rails
   class Server < ::Rack::Server
     class Options
+      DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze
+
       def parse!(args)
         args, options = args.dup, {}
 
@@ -91,7 +93,7 @@ module Rails
         environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:          false,
         caching:            false,
-        pid:                File.expand_path("tmp/pids/server.pid")
+        pid:                Options::DEFAULT_PID_PATH
       })
     end
 
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 3be4a74f74..0c49bd9c53 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -108,4 +108,13 @@ class Rails::ServerTest < ActiveSupport::TestCase
       end
     end
   end
+
+  def test_default_options
+    server = Rails::Server.new
+    old_default_options = server.default_options
+
+    Dir.chdir("..") do
+      assert_equal old_default_options, server.default_options
+    end
+  end
 end