aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorigor04 <igor.s04g@gmail.com>2019-07-12 19:22:36 +0300
committerigor04 <igor.s04g@gmail.com>2019-07-12 19:23:09 +0300
commit0fa41f72fcb773bd32c7ce77f9df33e328ff0e44 (patch)
tree86703a55c6185d04f5da1e2bf4b4f41088d09a8a /railties/test
parent141b30630cc9ec15dd5aa88e062383adedd335de (diff)
downloadrails-0fa41f72fcb773bd32c7ce77f9df33e328ff0e44.tar.gz
rails-0fa41f72fcb773bd32c7ce77f9df33e328ff0e44.tar.bz2
rails-0fa41f72fcb773bd32c7ce77f9df33e328ff0e44.zip
Prevent exception of loading database yaml with blank config file [closes: #36661]
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/configuration_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index f6bec3242a..a05d86f738 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1793,6 +1793,11 @@ module ApplicationTests
assert_equal [X, D], C.descendants
end
+ test "load_database_yaml returns blank hash if configuration file is blank" do
+ app_file "config/database.yml", ""
+ app "development"
+ assert_equal({}, Rails.application.config.load_database_yaml)
+ end
test "raises with proper error message if no database configuration found" do
FileUtils.rm("#{app_path}/config/database.yml")