Merge pull request #24253 from y-yagi/change_default_value_of_caching

changed default value of `caching` option to `nil`

2 files changed, 3 insertions, 2 deletions

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 4e5bf34773..c2434d62e2 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -93,7 +93,7 @@ module Rails
         DoNotReverseLookup: true,
         environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:          false,
-        caching:            false,
+        caching:            nil,
         pid:                Options::DEFAULT_PID_PATH
       })
     end
diff --git a/railties/test/commands/server_test.rb b/railties/test/commands/server_test.rb
index 0c49bd9c53..964b9a44de 100644
--- a/railties/test/commands/server_test.rb
+++ b/railties/test/commands/server_test.rb
@@ -54,7 +54,8 @@ class Rails::ServerTest < ActiveSupport::TestCase
   def test_caching_without_option
     args = []
     options = Rails::Server::Options.new.parse!(args)
-    assert_equal nil, options[:caching]
+    merged_options = Rails::Server.new.default_options.merge(options)
+    assert_equal nil, merged_options[:caching]
   end
 
   def test_caching_with_option