diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-27 13:21:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-27 13:21:02 -0400 |
commit | 1eaed91b122f3c525fa51c955f409038e2804b91 (patch) | |
tree | 8a20604ea3fd11e2b349e9bc8e7296b4683bd63e /actioncable/test/subscription_adapter/redis_test.rb | |
parent | 200b01ca413a43b0f874c81bc02024c1b6f0d7fc (diff) | |
parent | d7252786f4e133304b3d05966497272a2da9e098 (diff) | |
download | rails-1eaed91b122f3c525fa51c955f409038e2804b91.tar.gz rails-1eaed91b122f3c525fa51c955f409038e2804b91.tar.bz2 rails-1eaed91b122f3c525fa51c955f409038e2804b91.zip |
Merge pull request #29528 from padi/actioncable_redis_alt_config_with_password
Allows for other common redis options to be in cable.yml, by default
Diffstat (limited to 'actioncable/test/subscription_adapter/redis_test.rb')
-rw-r--r-- | actioncable/test/subscription_adapter/redis_test.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb index 11120b3f85..60596dd205 100644 --- a/actioncable/test/subscription_adapter/redis_test.rb +++ b/actioncable/test/subscription_adapter/redis_test.rb @@ -7,7 +7,7 @@ class RedisAdapterTest < ActionCable::TestCase include ChannelPrefixTest def cable_config - { adapter: "redis", driver: "ruby", url: "redis://127.0.0.1:6379/12" } + { adapter: "redis", driver: "ruby", url: "redis://:password@127.0.0.1:6379/12" } end end @@ -16,3 +16,11 @@ class RedisAdapterTest::Hiredis < RedisAdapterTest super.merge(driver: "hiredis") end end + +class RedisAdapterTest::AlternateConfiguration < RedisAdapterTest + def cable_config + alt_cable_config = super.dup + alt_cable_config.delete(:url) + alt_cable_config.merge(host: "127.0.0.1", port: 6379, db: 12, password: "password") + end +end |