Skip to content

Commit

Permalink
Update the CI matrix and fix test suite on Rails 7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
byroot committed Nov 22, 2023
1 parent 1399046 commit de5eacf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ '2.7', '3.0.2', '3.1', '3.2', 'head' ]
rails: [ '6.0', '6.1', '7.0', 'edge' ]
ruby: [ '2.7', '3.0', '3.1', '3.2', 'head' ]
rails: [ '6.1', '7.0', '7.1', 'edge' ]
exclude:
- ruby: '3.1'
rails: '6.0'
- ruby: '3.1'
rails: '6.1'
- ruby: '3.2'
rails: '6.0'
- ruby: '3.2'
rails: '6.1'

Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ gemspec

if ENV["RAILS_VERSION"] == "edge"
gem "activesupport", github: "rails/rails", branch: "main"
elsif ENV['RAILS_VERSION'] == "7.0"
gem "activesupport", ">= 7.0.0.alpha"
elsif ENV["RAILS_VERSION"]
gem "activesupport", "~> #{ENV["RAILS_VERSION"]}.0"
end
8 changes: 6 additions & 2 deletions test/support/acceptance_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ def without_gem(name)
test "raises if config.cache_classes is true" do
config_path = app.path("config/environments/development.rb")
config = File.read(config_path)
config.sub!(/config.cache_classes\s*=\s*false/, "config.cache_classes = true")
if config.include?("config.cache_classes")
config.sub!(/config\.cache_classes\s*=\s*false/, "config.cache_classes = true")
else # 7.1+ doesn't have config.cache_classes in the config at all
config.sub!(/config.enable_reloading = true/, "config.enable_reloading = true\nconfig.cache_classes = true")
end
File.write(config_path, config)

assert_failure "bin/rails runner 1", stderr: "Please, set config.cache_classes to false"
Expand Down Expand Up @@ -258,7 +262,7 @@ def exec_name
end

test "binstub" do
assert_success "bin/rails server --help", stdout: /Usage:\s+rails server/ # rails command fallback
assert_success "bin/rails server --help", stdout: /Usage:\s+(bin\/)?rails server/ # rails command fallback

assert_success "#{app.spring} binstub rake", stdout: "bin/rake: Spring already present"

Expand Down
6 changes: 5 additions & 1 deletion test/support/application_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ def generate_files
end

rewrite_file(application.path("config/environments/test.rb")) do |c|
c.sub!(/config\.cache_classes\s*=\s*true/, "config.cache_classes = false")
if c.include?("config.cache_classes")
c.sub!(/config\.cache_classes\s*=\s*true/, "config.cache_classes = false")
else # 7.1+ doesn't have config.cache_classes in the config at all
c.sub!(/config.enable_reloading = false/, "config.enable_reloading = false\nconfig.cache_classes = false")
end
c
end

Expand Down

0 comments on commit de5eacf

Please sign in to comment.