Fix tests after upgrading tests

features/support/sidekiq.rb

@@ -4,7 +4,10 @@
 require 'sidekiq/batch'
 
 # Turn off Sidekiq logging which pollutes the CI logs
-Sidekiq.logger = Sidekiq::Logger.new(nil, level: Logger::FATAL)
+Sidekiq.configure_client do |config|
+  config.logger = Sidekiq::Logger.new(nil, level: Logger::FATAL)
+end
+
 Sidekiq::Testing.inline!
 
 module Sidekiq

test/test_helpers/sidekiq.rb

@@ -4,8 +4,10 @@
 require 'sidekiq/lock/testing/inline'
 
 # Turn off Sidekiq logging which pollutes the CI logs
-Sidekiq.logger = Sidekiq::Logger.new(nil, level: Logger::FATAL)
-Sidekiq.strict_args! # Fail if parameters are not valid JSON
+Sidekiq.configure_client do |config|
+  config.logger = Sidekiq::Logger.new(nil, level: Logger::FATAL)
+end
+
 module TestHelpers
   module Sidekiq
     def self.included(base)

test/unit/backend/storage_test.rb

@@ -24,7 +24,7 @@ def given_redis_config(yaml)
 }
     given_redis_config(yaml) do
       mock = mock(id: 'redis://localhost:6389/1')
-      Redis::Client.expects(:new).with(host: 'example.com', port: 1337, db: 2, logger: Rails.logger).returns(mock)
+      Redis.expects(:new).with(host: 'example.com', port: 1337, db: 2).returns(mock)
 
       storage = Backend::Storage.clone.instance
       assert_equal 'redis://localhost:6389/1', storage.id
@@ -39,9 +39,7 @@ def given_redis_config(yaml)
   db: 2
 }
     given_redis_config(yaml) do
-      assert_equal({ :logger => Rails.logger,
-                     :host => 'example.com', :port => 1337, :db => 2 },
-                     Backend::Storage.parse_config )
+      assert_equal({ :host => 'example.com', :port => 1337, :db => 2 }, Backend::Storage.parse_config )
     end
   end
 

test/unit/redis_connection_error_test.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class RedisConnectionErrorTest < ActiveSupport::TestCase
+  test 'Name or service not known' do
+    redis_config = ThreeScale::RedisConfig.new(
+      url: 'redis://mymaster',
+      sentinels: 'invalid_host:26380,other_invalid_host:26381',
+      role: :master
+    ).config
+
+    redis = Redis.new(redis_config)
+
+    exception = assert_raises(RedisClient::CannotConnectError) { redis._client.send(:connect) }
+    assert_equal 'No sentinels available', exception.message
+  end
+end

test/unit/system/redis_pool_test.rb

@@ -7,7 +7,7 @@ class System::RedisPoolTest < ActiveSupport::TestCase
     ConnectionPool.expects(:new).with(timeout: 5, size: 5).at_least_once
     pool = System::RedisPool.new
     ConnectionPool.expects(:new).with(size: 3, timeout: 7).at_least_once
-    pool = System::RedisPool.new(pool_size: 3, pool_timeout: 7)
+    pool = System::RedisPool.new(size: 3, pool_timeout: 7)
   end
 
   test 'delegation' do

test/unit/three_scale/redis_config_test.rb

@@ -36,5 +36,12 @@ class RedisConfigTest < ActiveSupport::TestCase
       ]
       assert_equal expected_sentinels, config.sentinels
     end
+
+    test ':pool_size is renamed to :size' do
+      config = RedisConfig.new(pool_size: 5)
+
+      assert config.key? :size
+      assert_equal 5, config[:size]
+    end
   end
 end