From e039ecde2aceeee45ab3fde41a9ef8e97a7ab717 Mon Sep 17 00:00:00 2001
From: Gonzalo <456459+grzuy@users.noreply.github.com>
Date: Mon, 24 Jul 2023 22:13:39 -0300
Subject: [PATCH] ci: tests against redis gem v5 (#612)

* ci: tests against redis gem v5

* ci: fixes incompatibility between redis-store 1.9.2 and redis 5
---
 .github/workflows/build.yml                         |  2 +-
 Appraisals                                          | 13 +++++++------
 gemfiles/active_support_redis_cache_store.gemfile   |  2 +-
 .../active_support_redis_cache_store_pooled.gemfile |  2 +-
 gemfiles/active_support_redis_store.gemfile         |  1 +
 gemfiles/{redis_3.gemfile => redis_5.gemfile}       |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename gemfiles/{redis_3.gemfile => redis_5.gemfile} (80%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7552edf..b4a41ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,8 +32,8 @@ jobs:
           - rails_4_2
           - dalli3
           - dalli2
+          - redis_5
           - redis_4
-          - redis_3
           - connection_pool_dalli
           - active_support_redis_cache_store
           - active_support_redis_cache_store_pooled
diff --git a/Appraisals b/Appraisals
index 9035597..1472723 100644
--- a/Appraisals
+++ b/Appraisals
@@ -49,12 +49,12 @@ appraise 'dalli3' do
   gem 'dalli', '~> 3.0'
 end
 
-appraise 'redis_4' do
-  gem 'redis', '~> 4.0'
+appraise 'redis_5' do
+  gem 'redis', '~> 5.0'
 end
 
-appraise 'redis_3' do
-  gem 'redis', '~> 3.3'
+appraise 'redis_4' do
+  gem 'redis', '~> 4.0'
 end
 
 appraise "connection_pool_dalli" do
@@ -64,13 +64,13 @@ end
 
 appraise "active_support_redis_cache_store" do
   gem "activesupport", "~> 6.1.0"
-  gem "redis", "~> 4.0"
+  gem "redis", "~> 5.0"
 end
 
 appraise "active_support_redis_cache_store_pooled" do
   gem "activesupport", "~> 6.1.0"
   gem "connection_pool", "~> 2.2"
-  gem "redis", "~> 4.0"
+  gem "redis", "~> 5.0"
 end
 
 appraise "redis_store" do
@@ -79,4 +79,5 @@ end
 
 appraise "active_support_redis_store" do
   gem "redis-activesupport", "~> 5.0"
+  gem 'redis-store', '1.9.1' # remove after https://github.com/redis-store/redis-store/issues/358 is resolved
 end
diff --git a/gemfiles/active_support_redis_cache_store.gemfile b/gemfiles/active_support_redis_cache_store.gemfile
index 8acbbe1..21a16e7 100644
--- a/gemfiles/active_support_redis_cache_store.gemfile
+++ b/gemfiles/active_support_redis_cache_store.gemfile
@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 6.1.0"
-gem "redis", "~> 4.0"
+gem "redis", "~> 5.0"
 
 gemspec path: "../"
diff --git a/gemfiles/active_support_redis_cache_store_pooled.gemfile b/gemfiles/active_support_redis_cache_store_pooled.gemfile
index cf1e92e..f74738f 100644
--- a/gemfiles/active_support_redis_cache_store_pooled.gemfile
+++ b/gemfiles/active_support_redis_cache_store_pooled.gemfile
@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activesupport", "~> 6.1.0"
 gem "connection_pool", "~> 2.2"
-gem "redis", "~> 4.0"
+gem "redis", "~> 5.0"
 
 gemspec path: "../"
diff --git a/gemfiles/active_support_redis_store.gemfile b/gemfiles/active_support_redis_store.gemfile
index 517c70f..b3567fa 100644
--- a/gemfiles/active_support_redis_store.gemfile
+++ b/gemfiles/active_support_redis_store.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "redis-activesupport", "~> 5.0"
+gem "redis-store", "1.9.1"
 
 gemspec path: "../"
diff --git a/gemfiles/redis_3.gemfile b/gemfiles/redis_5.gemfile
similarity index 80%
rename from gemfiles/redis_3.gemfile
rename to gemfiles/redis_5.gemfile
index 403482c..0aac102 100644
--- a/gemfiles/redis_3.gemfile
+++ b/gemfiles/redis_5.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "redis", "~> 3.3"
+gem "redis", "~> 5.0"
 
 gemspec path: "../"