Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,16 @@ jobs:
strategy:
matrix:
ruby-version: [ '3.2', '3.1', '3.0', '2.7', '2.6', 'jruby-9.3', 'jruby-9.4' ]
gemfile: [ 'rails60', 'rails61' ]
gemfile: [ 'rails60', 'rails61', 'rails70', 'rails71' ]
exclude:
- ruby-version: '2.6'
gemfile: 'rails70'
- ruby-version: '2.6'
gemfile: 'rails71'
- ruby-version: 'jruby-9.3'
gemfile: 'rails70'
- ruby-version: 'jruby-9.3'
gemfile: 'rails71'
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
RAILS_ENV: test
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source "https://rubygems.org"

gem "activesupport", "~> 7.1.0"
# Specify your gem's dependencies in redis-cluster-activesupport.gemspec
gemspec
4 changes: 4 additions & 0 deletions gemfiles/rails70.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source "https://rubygems.org"

gem "activesupport", "~> 7.0.0"
gemspec path: "../"
4 changes: 4 additions & 0 deletions gemfiles/rails71.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source "https://rubygems.org"

gem "activesupport", "~> 7.1.0"
gemspec path: "../"
2 changes: 1 addition & 1 deletion redis-cluster-activesupport.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]

spec.add_dependency "activesupport", ">= 6.0", "< 7.1"
spec.add_dependency "activesupport", ">= 6.0", "< 7.2"
spec.add_development_dependency "bundler"
spec.add_development_dependency "fakeredis"
spec.add_development_dependency "pry"
Expand Down
13 changes: 10 additions & 3 deletions spec/active_support/cache/redis_cluster_store_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
describe ::ActiveSupport::Cache::RedisClusterStore do
let(:options) { {} }
let(:redis) { subject.redis }
let(:redis_proxy_method) do
if Gem::Version.new(ActiveSupport.version) >= Gem::Version.new("7.1.0")
:then
else
:with
end
end

subject { described_class.new(*options) }

Expand Down Expand Up @@ -42,21 +49,21 @@

describe "#write_entry" do
it "returns false when a known error is raised" do
expect(redis).to receive(:with).and_raise(::Redis::CommandError, "ERR Proxy error")
expect(redis).to receive(redis_proxy_method).and_raise(::Redis::CommandError, "ERR Proxy error")
expect(subject.write("test", "yolo")).to eq(false)
end
end

describe "#read_entry" do
it "returns false when a known error is raised" do
expect(redis).to receive(:with).and_raise(::Redis::CommandError, "ERR Proxy error")
expect(redis).to receive(redis_proxy_method).and_raise(::Redis::CommandError, "ERR Proxy error")
expect(subject.read("test")).to eq(nil)
end
end

describe "#delete_entry" do
it "returns false when a known error is raised" do
expect(redis).to receive(:with).and_raise(::Redis::CommandError, "ERR Proxy error")
expect(redis).to receive(redis_proxy_method).and_raise(::Redis::CommandError, "ERR Proxy error")
expect(subject.delete("test")).to eq(false)
end
end
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require "bundler/setup"
require "pry"
require "logger"
require "redis/cluster/activesupport"
require "fakeredis/rspec"

Expand Down