Fix deprecated method and testing (#153)

* fix deprecated methods

* fix deprecated testing

* use snake case

* use zrange in Redis versions aware

* fix typo

* correct params of zrange

* revert config to support sidekiq < 7.x, correct versions checking, correct params for zrange

lib/sidekiq/failures/sorted_entry.rb

@@ -11,7 +11,14 @@ def initialize(parent, score, item)
 
     def retry_failure
       Sidekiq.redis do |conn|
-        results = conn.zrangebyscore(Sidekiq::Failures::LIST_KEY, score, score)
+        # from Redis v6.2.0, zrangebyscore is deprecated and zrange with BYSCORE is used
+        # option byscore is available from redis-rb v4.6.0
+        results = if Gem::Version.new(conn.info["redis_version"].to_s) >= Gem::Version.new('6.2.0') &&
+                     Gem.loaded_specs['redis'].version >= Gem::Version.new('4.6.0')
+                    conn.zrange(Sidekiq::Failures::LIST_KEY, score.to_i, score.to_i, byscore: true)
+                  else
+                    conn.zrangebyscore(Sidekiq::Failures::LIST_KEY, score, score)
+                  end
         conn.zremrangebyscore(Sidekiq::Failures::LIST_KEY, score, score)
         results.map do |message|
           msg = Sidekiq.load_json(message)

lib/sidekiq/failures/web_extension.rb

@@ -65,7 +65,7 @@ def safe_relative_time(time)
         end
 
         app.post "/failures/all/reset" do
-          Sidekiq::Failures.reset_failures
+          Sidekiq::Failures.reset_failure_count
           redirect "#{root_path}failures"
         end
 
@@ -86,7 +86,7 @@ def safe_relative_time(time)
         app.post '/filter/failures' do
           @failures = Sidekiq::Failures::FailureSet.new.scan("*#{params[:substr]}*")
           @current_page = 1
-          @count = @total_size = @failures.count          
+          @count = @total_size = @failures.count
           render(:erb, File.read(File.join(view_path, "failures.erb")))
         end
       end

test/middleware_test.rb

@@ -53,13 +53,16 @@ def new_provider
 
       before do
         $invokes = 0
-        @boss = MiniTest::Mock.new
+        @boss = Minitest::Mock.new
         @provider = new_provider
         @processor = @provider.new_processor(@boss)
 
-        Sidekiq.server_middleware {|chain| chain.add Sidekiq::Failures::Middleware }
-        Sidekiq.redis = REDIS
-        Sidekiq.redis { |c| c.flushdb }
+        Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.add Sidekiq::Failures::Middleware
+          end
+        end
+        Sidekiq.redis(&:flushdb)
         Sidekiq.instance_eval { @failures_default_mode = nil }
       end
 
@@ -155,7 +158,6 @@ def perform(args)
         assert_equal 1, $invokes
       end
 
-
       it "doesn't record failure if going to be retired again and configured to track exhaustion" do
         msg = create_work('class' => MockWorker.to_s, 'args' => ['myarg'], 'retry' => true, 'failures' => 'exhausted')
 
@@ -234,7 +236,7 @@ def perform(args)
         assert_equal 0, failures_count
 
         3.times do
-          boss = MiniTest::Mock.new
+          boss = Minitest::Mock.new
           processor = @provider.new_processor(boss)
 
           assert_raises TestException do

test/test_helper.rb

@@ -15,4 +15,4 @@
 
 Sidekiq.logger.level = Logger::ERROR
 
-REDIS = Sidekiq::RedisConnection.create(url: "redis://localhost/15")
+REDIS = Sidekiq::RedisConnection.create(url: "redis://127.0.0.1:6379/0")

test/web_extension_test.rb

@@ -14,8 +14,7 @@ def app
     before do
       env 'rack.session', { csrf: TOKEN }
       env 'HTTP_X_CSRF_TOKEN', TOKEN
-      Sidekiq.redis = REDIS
-      Sidekiq.redis {|c| c.flushdb }
+      Sidekiq.redis(&:flushdb)
     end
 
     it 'can display home with failures tab' do