diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-12-18 19:57:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 19:57:35 +0100 |
| commit | 053a4c699043ea5449effaba0549b2f8a5821228 (patch) | |
| tree | 9cfd7534cd26773698584e981dd1858b13c9bc53 /railties/test/application | |
| parent | 1d047235b0cefcb80d4e18fed732cbe2bd32a8ee (diff) | |
| parent | 35373219c91ea8096ef2f8e7f3c62bcd46f436be (diff) | |
| download | rails-053a4c699043ea5449effaba0549b2f8a5821228.tar.gz rails-053a4c699043ea5449effaba0549b2f8a5821228.tar.bz2 rails-053a4c699043ea5449effaba0549b2f8a5821228.zip | |
Merge pull request #31348 from y-yagi/fix_31283
Raise an error only when `require_master_key` is specified
Diffstat (limited to 'railties/test/application')
| -rw-r--r-- | railties/test/application/configuration_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index d28f7ffc7f..ec745a397e 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -707,6 +707,14 @@ module ApplicationTests assert_match(/Missing.*RAILS_MASTER_KEY/, error) end + test "credentials does not raise error when require_master_key is false and master key does not exist" do + remove_file "config/master.key" + add_to_config "config.require_master_key = false" + app "development" + + assert_not app.credentials.secret_key_base + end + test "protect from forgery is the default in a new app" do make_basic_app |