aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-08-05 09:06:32 -0500
committerGitHub <noreply@github.com>2017-08-05 09:06:32 -0500
commitea5c99dce1e23b0f8211583d6cb7846d9e303971 (patch)
treeb1686aa93cd83f7b1186b3ee32dfa692c05ad531 /railties
parent44da50df17a6aad9ba03ee27db3de8fdc054fd26 (diff)
parent1ab1f8759607cae037522717594c02b6c7a7b168 (diff)
downloadrails-ea5c99dce1e23b0f8211583d6cb7846d9e303971.tar.gz
rails-ea5c99dce1e23b0f8211583d6cb7846d9e303971.tar.bz2
rails-ea5c99dce1e23b0f8211583d6cb7846d9e303971.zip
Merge pull request #30080 from georgeclaghorn/active-storage-secret-key-base
Active Storage: check for `app.secrets.secret_key_base`, not `app.config.secret_key_base`
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/configuration_test.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 381bc2694f..c2f6a5a95c 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -453,10 +453,8 @@ module ApplicationTests
secret_key_base: 123
YAML
- app "development"
-
assert_raise(ArgumentError) do
- app.key_generator
+ app "development"
end
end