From 32e0c9998e031d835fa57a1254b5a4bc6c633b04 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Mon, 26 Sep 2022 17:58:38 -0700
Subject: [PATCH] Test multiple versions of Redis gem in tests [skip ci]

---
 gemfiles/activerecord52.gemfile |  2 +-
 gemfiles/activerecord60.gemfile |  2 +-
 gemfiles/activerecord61.gemfile |  2 +-
 test/support/redis.rb           |  9 ++++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gemfiles/activerecord52.gemfile b/gemfiles/activerecord52.gemfile
index 180b726..8f741d0 100644
--- a/gemfiles/activerecord52.gemfile
+++ b/gemfiles/activerecord52.gemfile
@@ -9,7 +9,7 @@ gem "activerecord", "~> 5.2.0"
 gem "actionpack", "~> 5.2.0"
 gem "activejob", "~> 5.2.0", require: "active_job"
 gem "elasticsearch", "~> 7"
-gem "redis"
+gem "redis", "< 4.8" # before sadd return value deprecation
 gem "connection_pool"
 gem "kaminari"
 gem "gemoji-parser"
diff --git a/gemfiles/activerecord60.gemfile b/gemfiles/activerecord60.gemfile
index 83529f3..abb4006 100644
--- a/gemfiles/activerecord60.gemfile
+++ b/gemfiles/activerecord60.gemfile
@@ -9,7 +9,7 @@ gem "activerecord", "~> 6.0.0"
 gem "actionpack", "~> 6.0.0"
 gem "activejob", "~> 6.0.0", require: "active_job"
 gem "elasticsearch", "~> 7"
-gem "redis"
+gem "redis", "~> 4.8" # sadd return value deprecation
 gem "connection_pool"
 gem "kaminari"
 gem "gemoji-parser"
diff --git a/gemfiles/activerecord61.gemfile b/gemfiles/activerecord61.gemfile
index 2c80452..c03a5c8 100644
--- a/gemfiles/activerecord61.gemfile
+++ b/gemfiles/activerecord61.gemfile
@@ -9,7 +9,7 @@ gem "activerecord", "~> 6.1.0"
 gem "actionpack", "~> 6.1.0"
 gem "activejob", "~> 6.1.0", require: "active_job"
 gem "elasticsearch", "~> 8"
-gem "redis"
+gem "redis", ">= 5" # after sadd return value deprecation
 gem "connection_pool"
 gem "kaminari"
 gem "gemoji-parser"
diff --git a/test/support/redis.rb b/test/support/redis.rb
index ac2c9e6..873d463 100644
--- a/test/support/redis.rb
+++ b/test/support/redis.rb
@@ -1,8 +1,11 @@
+options = {}
+options[:logger] = $logger if Redis::VERSION.to_i < 5
+
 Searchkick.redis =
   if defined?(ConnectionPool)
-    ConnectionPool.new { Redis.new }
+    ConnectionPool.new { Redis.new(**options) }
   else
-    Redis.new
+    Redis.new(**options)
   end
 
 module RedisInstrumentation
@@ -16,4 +19,4 @@ module RedisInstrumentation
     super
   end
 end
-RedisClient.register(RedisInstrumentation)
+RedisClient.register(RedisInstrumentation) if Redis::VERSION.to_i >= 5
--
libgit2 0.21.0