diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-06 14:23:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-06 14:23:44 -0400 |
commit | 2de047dbeb88215e1b5b86c1154e7d0f3002f9ba (patch) | |
tree | 6246d954cd5e49a14e68865cc81806c0dc8d1625 /actioncable/test | |
parent | 53be0132c3f66dd8510921215d940641bbfd9588 (diff) | |
parent | bcd11e07b5369b661e869631dc485fd5e3ce88a5 (diff) | |
download | rails-2de047dbeb88215e1b5b86c1154e7d0f3002f9ba.tar.gz rails-2de047dbeb88215e1b5b86c1154e7d0f3002f9ba.tar.bz2 rails-2de047dbeb88215e1b5b86c1154e7d0f3002f9ba.zip |
Merge pull request #33798 from got2be/actioncable-redis-client-name
ActionCable: add id option to redis adapter config
Diffstat (limited to 'actioncable/test')
-rw-r--r-- | actioncable/test/subscription_adapter/redis_test.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb index 3dc995331a..7874bfcfa8 100644 --- a/actioncable/test/subscription_adapter/redis_test.rb +++ b/actioncable/test/subscription_adapter/redis_test.rb @@ -30,14 +30,22 @@ class RedisAdapterTest::AlternateConfiguration < RedisAdapterTest end class RedisAdapterTest::Connector < ActionCable::TestCase - test "slices url, host, port, db, and password from config" do - config = { url: 1, host: 2, port: 3, db: 4, password: 5 } + test "slices url, host, port, db, password and id from config" do + config = { url: 1, host: 2, port: 3, db: 4, password: 5, id: "Some custom ID" } assert_called_with ::Redis, :new, [ config ] do connect config.merge(other: "unrelated", stuff: "here") end end + test "adds default id if it is not specified" do + config = { url: 1, host: 2, port: 3, db: 4, password: 5, id: "ActionCable1-PID-#{$$}" } + + assert_called_with ::Redis, :new, [ config ] do + connect config + end + end + def connect(config) ActionCable::SubscriptionAdapter::Redis.redis_connector.call(config) end |