Skip to content

Commit

Permalink
test: update ruby and rails versions
Browse files Browse the repository at this point in the history
  • Loading branch information
grzuy committed Jan 24, 2021
1 parent dda2489 commit 33d1bac
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 13 deletions.
25 changes: 19 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ language: ruby
cache: bundler

rvm:
- ruby-head
- 2.7.1
- 3.0.0
- 2.7.2
- 2.6.6
- 2.5.8
- 2.4.10
Expand All @@ -16,6 +16,7 @@ before_install:
gemfile:
- gemfiles/rack_2.gemfile
- gemfiles/rack_1.gemfile
- gemfiles/rails_6_1.gemfile
- gemfiles/rails_6_0.gemfile
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_5_1.gemfile
Expand All @@ -30,13 +31,25 @@ gemfile:
- gemfiles/active_support_redis_store.gemfile

matrix:
allow_failures:
- rvm: ruby-head
exclude:
- gemfile: gemfiles/rack_1.gemfile
rvm: 2.7.1
rvm: 3.0.0
- gemfile: gemfiles/rails_5_2.gemfile
rvm: 3.0.0
- gemfile: gemfiles/rails_5_1.gemfile
rvm: 3.0.0
- gemfile: gemfiles/rails_4_2.gemfile
rvm: 2.7.1
rvm: 3.0.0
- gemfile: gemfiles/dalli2.gemfile
rvm: 3.0.0
- gemfile: gemfiles/connection_pool_dalli.gemfile
rvm: 3.0.0
- gemfile: gemfiles/rack_1.gemfile
rvm: 2.7.2
- gemfile: gemfiles/rails_4_2.gemfile
rvm: 2.7.2
- gemfile: gemfiles/rails_6_1.gemfile
rvm: 2.4.10
- gemfile: gemfiles/rails_6_0.gemfile
rvm: 2.4.10
fast_finish: true
Expand Down
8 changes: 6 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ appraise "rack_1" do
gem "rack-test", ">= 0.6"
end

appraise 'rails_6-1' do
gem 'railties', '~> 6.1.0'
end

appraise 'rails_6-0' do
gem 'railties', '~> 6.0.0'
end
Expand Down Expand Up @@ -55,12 +59,12 @@ appraise "connection_pool_dalli" do
end

appraise "active_support_redis_cache_store" do
gem "activesupport", "~> 5.2.0"
gem "activesupport", ">= 5.2", "< 6.2"
gem "redis", "~> 4.0"
end

appraise "active_support_redis_cache_store_pooled" do
gem "activesupport", "~> 5.2.0"
gem "activesupport", ">= 5.2", "< 6.2"
gem "connection_pool", "~> 2.2"
gem "redis", "~> 4.0"
end
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/active_support_redis_cache_store.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "activesupport", "~> 5.2.0"
gem "activesupport", ">= 5.2", "< 6.2"
gem "redis", "~> 4.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/active_support_redis_cache_store_pooled.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "activesupport", "~> 5.2.0"
gem "activesupport", ">= 5.2", "< 6.2"
gem "connection_pool", "~> 2.2"
gem "redis", "~> 4.0"

Expand Down
7 changes: 7 additions & 0 deletions gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "railties", "~> 6.1.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion rack-attack.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'byebug', '~> 11.0'
end

s.add_development_dependency 'railties', '>= 4.2', '< 6.1'
s.add_development_dependency 'railties', '>= 4.2', '< 6.2'
end
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
Rack::Attack.cache.store.clear
end

it_works_for_cache_backed_features(fetch_from_store: ->(key) { Rack::Attack.cache.store.fetch(key) })
it_works_for_cache_backed_features(fetch_from_store: ->(key) { Rack::Attack.cache.store.read(key) })
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
Rack::Attack.cache.store.clear
end

it_works_for_cache_backed_features(fetch_from_store: ->(key) { Rack::Attack.cache.store.fetch(key) })
it_works_for_cache_backed_features(fetch_from_store: ->(key) { Rack::Attack.cache.store.read(key) })
end
end

0 comments on commit 33d1bac

Please sign in to comment.