diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-03-21 22:08:48 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-03-21 22:08:48 +0100 |
| commit | 62da69303bd94bfc978dd54f0084105a861a15c3 (patch) | |
| tree | a43d5529daf68feb8aa8ce3573af2afab1a511d8 /railties/test | |
| parent | 01ef3b7d71a597f3757ddf26bd21d42ba2b691b2 (diff) | |
| parent | 173b524cbcdd338ecfaa3e263343344001394ce2 (diff) | |
| download | rails-62da69303bd94bfc978dd54f0084105a861a15c3.tar.gz rails-62da69303bd94bfc978dd54f0084105a861a15c3.tar.bz2 rails-62da69303bd94bfc978dd54f0084105a861a15c3.zip | |
Merge pull request #24253 from y-yagi/change_default_value_of_caching
changed default value of `caching` option to `nil`
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/commands/server_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |