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