diff options
author | Matthew Draper <matthew@trebex.net> | 2016-02-02 02:44:06 +1030 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-02-02 02:44:06 +1030 |
commit | 8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c (patch) | |
tree | 925305ca83e3e9727fa61b717fe5f72269e4732e /actioncable/test | |
parent | 8b2c618cefef1ccd83d270cbacdd19abf4be9b2f (diff) | |
parent | e77368637e17e6a33db2713f651e85a09456c645 (diff) | |
download | rails-8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c.tar.gz rails-8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c.tar.bz2 rails-8a51f6fbbf720db9edce3e1c973a9f8c5ee7931c.zip |
Merge pull request #23381 from matthewd/uneventful-redis
Redis sans EventMachine
Diffstat (limited to 'actioncable/test')
-rw-r--r-- | actioncable/test/subscription_adapter/evented_redis_test.rb | 10 | ||||
-rw-r--r-- | actioncable/test/subscription_adapter/redis_test.rb | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb new file mode 100644 index 0000000000..70333e51bd --- /dev/null +++ b/actioncable/test/subscription_adapter/evented_redis_test.rb @@ -0,0 +1,10 @@ +require 'test_helper' +require_relative './common' + +class EventedRedisAdapterTest < ActionCable::TestCase + include CommonSubscriptionAdapterTest + + def cable_config + { adapter: 'evented_redis', url: 'redis://127.0.0.1:6379/12' } + end +end diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb index 8d52832c87..4f34dd86c9 100644 --- a/actioncable/test/subscription_adapter/redis_test.rb +++ b/actioncable/test/subscription_adapter/redis_test.rb @@ -5,6 +5,12 @@ class RedisAdapterTest < ActionCable::TestCase include CommonSubscriptionAdapterTest def cable_config - { adapter: 'redis', url: 'redis://127.0.0.1:6379/12' } + { adapter: 'redis', driver: 'ruby', url: 'redis://127.0.0.1:6379/12' } + end +end + +class RedisAdapterTest::Hiredis < RedisAdapterTest + def cable_config + super.merge(driver: 'hiredis') end end |