diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2017-10-08 16:14:55 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-08 16:14:55 -0700 |
commit | 5fb282239d8ece0eb14121eecfd5446d7aa70343 (patch) | |
tree | 617dc1cade7c06cdb8fe3f2d5a55f3516b7b8911 /activejob/test/support/integration/adapters/resque.rb | |
parent | 34d12d1483236f997125e2b1f17b96e76fdff99b (diff) | |
parent | 53c516d88d48bafee5bd125a368352dd94f5fdad (diff) | |
download | rails-5fb282239d8ece0eb14121eecfd5446d7aa70343.tar.gz rails-5fb282239d8ece0eb14121eecfd5446d7aa70343.tar.bz2 rails-5fb282239d8ece0eb14121eecfd5446d7aa70343.zip |
Merge pull request #30748 from jeremy/redis-rb-4.0.1
redis-rb 4.0 support
Diffstat (limited to 'activejob/test/support/integration/adapters/resque.rb')
-rw-r--r-- | activejob/test/support/integration/adapters/resque.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb index 484b476567..7d5174b957 100644 --- a/activejob/test/support/integration/adapters/resque.rb +++ b/activejob/test/support/integration/adapters/resque.rb @@ -3,7 +3,7 @@ module ResqueJobsManager def setup ActiveJob::Base.queue_adapter = :resque - Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.connect(url: "redis://:password@127.0.0.1:6379/12", thread_safe: true) + Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.new(url: "redis://:password@127.0.0.1:6379/12", thread_safe: true) Resque.logger = Rails.logger unless can_run? puts "Cannot run integration tests for resque. To be able to run integration tests for resque you need to install and start redis.\n" @@ -41,11 +41,8 @@ module ResqueJobsManager end def can_run? - begin - Resque.redis.client.connect - rescue - return false - end - true + Resque.redis.ping == "PONG" + rescue + false end end |