diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-12 01:20:53 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 01:20:53 +0930 |
| commit | fb129373a3f99c70b9d2548312390de2ce6abf91 (patch) | |
| tree | 061a771d3e0c643ec62cf8671b5854ee1df516fa | |
| parent | 07ed697f7b0debd8736a188fad67fe5e0c98739e (diff) | |
| parent | be806d8696675b82e4407eeaf8b63f59afd3f00e (diff) | |
| download | rails-fb129373a3f99c70b9d2548312390de2ce6abf91.tar.gz rails-fb129373a3f99c70b9d2548312390de2ce6abf91.tar.bz2 rails-fb129373a3f99c70b9d2548312390de2ce6abf91.zip | |
Merge pull request #29752 from palkan/master
Fix PostgreSql adapter setup for ActionCable tests
| -rw-r--r-- | actioncable/test/subscription_adapter/postgresql_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/test/subscription_adapter/postgresql_test.rb b/actioncable/test/subscription_adapter/postgresql_test.rb index ada4c2e2bd..29c746733d 100644 --- a/actioncable/test/subscription_adapter/postgresql_test.rb +++ b/actioncable/test/subscription_adapter/postgresql_test.rb @@ -12,7 +12,7 @@ class PostgresqlAdapterTest < ActionCable::TestCase if Dir.exist?(ar_tests) require File.join(ar_tests, "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 end |