diff --git a/test/helper.rb b/test/helper.rb index 7d081260..03ff0e0f 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -31,9 +31,9 @@ Sidekiq.logger.level = Logger::ERROR Sidekiq::Test = Minitest::Test require 'sidekiq/redis_connection' -redis_url = ENV['REDIS_URL'] || 'redis://localhost/15' -REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy') +REDIS_URL = ENV['REDIS_URL'] || 'redis://localhost/15' +REDIS = Sidekiq::RedisConnection.create(:url => REDIS_URL, :namespace => 'testy') Sidekiq.configure_client do |config| - config.redis = { :url => redis_url, :namespace => 'testy' } + config.redis = { :url => REDIS_URL, :namespace => 'testy' } end diff --git a/test/test_fetch.rb b/test/test_fetch.rb index 08aa741a..121cff98 100644 --- a/test/test_fetch.rb +++ b/test/test_fetch.rb @@ -4,7 +4,7 @@ require 'sidekiq/fetch' class TestFetcher < Sidekiq::Test describe 'fetcher' do before do - Sidekiq.redis = { :namespace => 'fuzzy' } + Sidekiq.redis = { :url => REDIS_URL, :namespace => 'fuzzy' } Sidekiq.redis do |conn| conn.flushdb conn.rpush('queue:basic', 'msg') diff --git a/test/test_redis_connection.rb b/test/test_redis_connection.rb index fdbcc1eb..4a4eb85f 100644 --- a/test/test_redis_connection.rb +++ b/test/test_redis_connection.rb @@ -70,6 +70,14 @@ class TestRedisConnection < Sidekiq::Test describe ".determine_redis_provider" do + before do + @old_env = ENV.to_hash + end + + after do + ENV.update(@old_env) + end + def with_env_var(var, uri, skip_provider=false) vars = ['REDISTOGO_URL', 'REDIS_PROVIDER', 'REDIS_URL'] - [var] vars.each do |v|