Test multiple versions of Redis gem in tests [skip ci]

Andrew Kane
1 parent ec9f8e28
Showing 4 changed files with 9 additions and 6 deletions Show diff stats
gemfiles/activerecord52.gemfile
gemfiles/activerecord60.gemfile
gemfiles/activerecord61.gemfile
test/support/redis.rb
@@ -9,7 +9,7 @@ gem &quot;activerecord&quot;, &quot;~&gt; 5.2.0&quot;
 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"
@@ -9,7 +9,7 @@ gem &quot;activerecord&quot;, &quot;~&gt; 6.0.0&quot;
 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"
@@ -9,7 +9,7 @@ gem &quot;activerecord&quot;, &quot;~&gt; 6.1.0&quot;
 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"
+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
...	...	@@ -9,7 +9,7 @@ gem "activerecord", "~> 5.2.0"
9	9	gem "actionpack", "~> 5.2.0"
10	10	gem "activejob", "~> 5.2.0", require: "active_job"
11	11	gem "elasticsearch", "~> 7"
12		-gem "redis"
	12	+gem "redis", "< 4.8" # before sadd return value deprecation
13	13	gem "connection_pool"
14	14	gem "kaminari"
15	15	gem "gemoji-parser"
...	...
...	...	@@ -9,7 +9,7 @@ gem "activerecord", "~> 6.0.0"
9	9	gem "actionpack", "~> 6.0.0"
10	10	gem "activejob", "~> 6.0.0", require: "active_job"
11	11	gem "elasticsearch", "~> 7"
12		-gem "redis"
	12	+gem "redis", "~> 4.8" # sadd return value deprecation
13	13	gem "connection_pool"
14	14	gem "kaminari"
15	15	gem "gemoji-parser"
...	...
...	...	@@ -9,7 +9,7 @@ gem "activerecord", "~> 6.1.0"
9	9	gem "actionpack", "~> 6.1.0"
10	10	gem "activejob", "~> 6.1.0", require: "active_job"
11	11	gem "elasticsearch", "~> 8"
12		-gem "redis"
	12	+gem "redis", ">= 5" # after sadd return value deprecation
13	13	gem "connection_pool"
14	14	gem "kaminari"
15	15	gem "gemoji-parser"
...	...
	1	+options = {}
	2	+options[:logger] = $logger if Redis::VERSION.to_i < 5
	3	+
1	4	Searchkick.redis =
2	5	if defined?(ConnectionPool)
3		- ConnectionPool.new { Redis.new }
	6	+ ConnectionPool.new { Redis.new(**options) }
4	7	else
5		- Redis.new
	8	+ Redis.new(**options)
6	9	end
7	10
8	11	module RedisInstrumentation
...	...	@@ -16,4 +19,4 @@ module RedisInstrumentation
16	19	super
17	20	end
18	21	end
19		-RedisClient.register(RedisInstrumentation)
	22	+RedisClient.register(RedisInstrumentation) if Redis::VERSION.to_i >= 5
...	...