Skip to content

Commit 828c875

Browse files
authored
Merge pull request #682 from rails/rm-fix-test
Fix tests
2 parents 5c70765 + 6c6ca77 commit 828c875

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
ruby: [ '2.7', '3.0.2', 'head' ]
9+
ruby: [ '2.7', '3.0.2', '3.1', 'head' ]
1010
rails: [ '6.0', '6.1', '7.0', 'edge' ]
11+
exclude:
12+
- ruby: '3.1'
13+
rails: '6.0'
14+
- ruby: '3.1'
15+
rails: '6.1'
1116

1217
env:
1318
RAILS_VERSION: ${{ matrix.rails }}

test/support/acceptance_test.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,12 +659,14 @@ def exec_name
659659
end
660660

661661
test "custom bundle path" do
662+
skip if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.1.0") && ENV["RAILS_VERSION"] == "7.0"
663+
662664
bundle_path = app.path(".bundle/#{Bundler.ruby_scope}")
663665
bundle_path.dirname.mkpath
664666

665667
FileUtils.cp_r "#{app.gem_home}/", bundle_path.to_s
666668

667-
app.run! "bundle install --path .bundle --clean --prefer-local"
669+
app.run! "bundle install --path .bundle --local"
668670

669671
assert_speedup do
670672
2.times { assert_success "bundle exec rails runner ''" }

0 commit comments

Comments
 (0)