diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-03-20 17:08:57 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2016-03-21 08:13:27 +0900 |
| commit | 173b524cbcdd338ecfaa3e263343344001394ce2 (patch) | |
| tree | 966926ebec2187060199deab2ab53eb86ffd21ae /railties/test | |
| parent | dda31d59a03adb7e5aa372e72bb66a3886632f2f (diff) | |
| download | rails-173b524cbcdd338ecfaa3e263343344001394ce2.tar.gz rails-173b524cbcdd338ecfaa3e263343344001394ce2.tar.bz2 rails-173b524cbcdd338ecfaa3e263343344001394ce2.zip | |
changed default value of `caching` option to `nil`
The default is that's false, caching even if you do not specify the caching option is determined not to use,
and `tmp/caching-dev.txt` will be deleted.
If it is this, regardless of whether or not there is `tmp/caching-dev.txt`, be sure to order would be necessary to specify the caching option,
I think that in than good to so as not to do anything by default.
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 |