From bcd11e07b5369b661e869631dc485fd5e3ce88a5 Mon Sep 17 00:00:00 2001 From: Ilia Kasianenko Date: Wed, 5 Sep 2018 16:54:44 +0300 Subject: ActionCable: add id option to redis adapter config --- actioncable/test/subscription_adapter/redis_test.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'actioncable/test') 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 -- cgit v1.2.3