1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #29752 from palkan/master

Fix PostgreSql adapter setup for ActionCable tests
This commit is contained in:
Matthew Draper 2017-07-12 01:20:53 +09:30 committed by GitHub
commit fb129373a3

View file

@ -12,7 +12,7 @@ class PostgresqlAdapterTest < ActionCable::TestCase
if Dir.exist?(ar_tests) if Dir.exist?(ar_tests)
require File.join(ar_tests, "config") require File.join(ar_tests, "config")
require File.join(ar_tests, "support/config") require File.join(ar_tests, "support/config")
local_config = ARTest.config["arunit"] local_config = ARTest.config["connections"]["postgresql"]["arunit"]
database_config.update local_config if local_config database_config.update local_config if local_config
end end