Skip to content

Commit dbc8e77

Browse files
authored
Make test suite work (#5770)
* Drop support for Rails < 7 and Ruby < 2.7 * Add tests to support to Rails 8+ * Fix test suite across all supported versions
1 parent 9c5e4d3 commit dbc8e77

File tree

9 files changed

+161
-130
lines changed

9 files changed

+161
-130
lines changed

.github/workflows/test.yml

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ jobs:
99
- Gemfile
1010
- gemfiles/Gemfile-rails-main
1111
- gemfiles/Gemfile-rails-7-0
12-
- gemfiles/Gemfile-rails-6-1
13-
- gemfiles/Gemfile-rails-6-0
12+
- gemfiles/Gemfile-rails-7-1
13+
- gemfiles/Gemfile-rails-7-2
14+
- gemfiles/Gemfile-rails-8-0
1415
ruby:
1516
- '3.3'
1617
- '3.2'
@@ -21,26 +22,32 @@ jobs:
2122
- DEVISE_ORM=active_record
2223
- DEVISE_ORM=mongoid
2324
exclude:
24-
- gemfile: gemfiles/Gemfile-rails-main
25-
ruby: '2.7' # Rails > 7.1 supports Ruby >= 3.1
26-
- gemfile: gemfiles/Gemfile-rails-main
27-
ruby: '3.0' # Rails > 7.1 supports Ruby >= 3.1
28-
- gemfile: gemfiles/Gemfile-rails-main
29-
ruby: '3.1' # Rails >= 8.0 supports Ruby >= 3.2
3025
- gemfile: Gemfile
3126
env: DEVISE_ORM=mongoid
3227
- gemfile: gemfiles/Gemfile-rails-main
3328
env: DEVISE_ORM=mongoid
34-
- gemfile: gemfiles/Gemfile-rails-7-0
35-
env: DEVISE_ORM=mongoid
36-
- gemfile: gemfiles/Gemfile-rails-6-1
37-
env: DEVISE_ORM=mongoid
38-
- gemfile: gemfiles/Gemfile-rails-6-0
39-
ruby: '3.2'
40-
- gemfile: gemfiles/Gemfile-rails-6-0
29+
- gemfile: Gemfile
4130
ruby: '3.1'
42-
- gemfile: gemfiles/Gemfile-rails-6-0
43-
env: DEVISE_ORM=mongoid
31+
- gemfile: Gemfile
32+
ruby: '3.0'
33+
- gemfile: Gemfile
34+
ruby: '2.7'
35+
- gemfile: gemfiles/Gemfile-rails-main
36+
ruby: '3.1'
37+
- gemfile: gemfiles/Gemfile-rails-main
38+
ruby: '3.0'
39+
- gemfile: gemfiles/Gemfile-rails-main
40+
ruby: '2.7'
41+
- gemfile: gemfiles/Gemfile-rails-8-0
42+
ruby: '3.1'
43+
- gemfile: gemfiles/Gemfile-rails-8-0
44+
ruby: '3.0'
45+
- gemfile: gemfiles/Gemfile-rails-8-0
46+
ruby: '2.7'
47+
- gemfile: gemfiles/Gemfile-rails-7-2
48+
ruby: '3.0'
49+
- gemfile: gemfiles/Gemfile-rails-7-2
50+
ruby: '2.7'
4451
runs-on: ubuntu-latest
4552
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
4653
BUNDLE_GEMFILE: ${{ matrix.gemfile }}

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ source "https://rubygems.org"
44

55
gemspec
66

7-
gem "rails", "~> 7.1.0"
87
gem "omniauth"
98
gem "omniauth-oauth2"
9+
gem "rails", "~> 8.1.0.rc1"
1010
gem "rdoc"
1111

1212
gem "rails-controller-testing", github: "rails/rails-controller-testing"
1313

1414
gem "responders", "~> 3.1"
1515

1616
group :test do
17+
gem "mocha", "~> 2.1", require: false
1718
gem "omniauth-facebook"
1819
gem "omniauth-openid"
1920
gem "rexml"
2021
gem "timecop"
21-
gem "webrat", "0.7.3", require: false
22-
gem "mocha", "~> 2.1", require: false
22+
gem "webrat"
2323
end
2424

2525
platforms :ruby do
26-
gem "sqlite3", "~> 1.4"
26+
gem "sqlite3", "~> 2.1"
2727
end
2828

2929
# platforms :jruby do

0 commit comments

Comments
 (0)