Skip to content

Commit 5d52b8f

Browse files
bquorningbquorning
authored
Merge pull request #177 from zendesk/bquorning/fix-rails-main-tests
2 parents 23c3cf9 + 1a7f83f commit 5d52b8f

11 files changed

Lines changed: 302 additions & 126 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
gemfile:
2727
- rails7.2
2828
- rails8.0
29+
- rails8.1
2930
adapter_mysql:
3031
- mysql2
3132
- trilogy

‎Changelog.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
99
### Changed
1010
- `.class_eval` now raises an exception when called on `ConnectionProxy`. Use `.arhp_connection_proxy_class_eval` if you _really_ need to modify the `ConnectionProxy` class.
1111

12+
### Added
13+
- Testing with Rails 8.1.
14+
1215
### Removed
1316
- `ConnectionProxy` no longer overrides `#class` to return the class of the proxied connection adapter.
1417
- Support for Rails 7.1.

‎Gemfile.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (7.2.2.2)
11-
activesupport (= 7.2.2.2)
12-
activerecord (7.2.2.2)
13-
activemodel (= 7.2.2.2)
14-
activesupport (= 7.2.2.2)
10+
activemodel (7.2.3)
11+
activesupport (= 7.2.3)
12+
activerecord (7.2.3)
13+
activemodel (= 7.2.3)
14+
activesupport (= 7.2.3)
1515
timeout (>= 0.4.0)
16-
activesupport (7.2.2.2)
16+
activesupport (7.2.3)
1717
base64
1818
benchmark (>= 0.3)
1919
bigdecimal
@@ -27,41 +27,42 @@ GEM
2727
tzinfo (~> 2.0, >= 2.0.5)
2828
ast (2.4.3)
2929
base64 (0.3.0)
30-
benchmark (0.4.1)
31-
bigdecimal (3.2.2)
30+
benchmark (0.5.0)
31+
bigdecimal (3.3.1)
3232
byebug (12.0.0)
3333
coderay (1.1.3)
3434
concurrent-ruby (1.3.5)
35-
connection_pool (2.5.3)
35+
connection_pool (2.5.4)
3636
docker-api (2.4.0)
3737
excon (>= 0.64.0)
3838
multi_json
3939
drb (2.2.3)
40-
excon (1.3.0)
40+
excon (1.3.1)
4141
logger
4242
i18n (1.14.7)
4343
concurrent-ruby (~> 1.0)
44-
json (2.13.2)
44+
json (2.16.0)
4545
language_server-protocol (3.17.0.5)
4646
lint_roller (1.1.0)
4747
logger (1.7.0)
4848
method_source (1.1.0)
49-
minitest (5.25.5)
49+
minitest (5.26.1)
5050
minitest-fail-fast (0.1.0)
5151
minitest (~> 5)
5252
minitest-line (0.6.5)
5353
minitest (~> 5.0)
5454
minitest-mock_expectations (1.2.0)
5555
multi_json (1.17.0)
56-
mysql2 (0.5.6)
56+
mysql2 (0.5.7)
57+
bigdecimal
5758
parallel (1.27.0)
58-
parser (3.3.9.0)
59+
parser (3.3.10.0)
5960
ast (~> 2.4.1)
6061
racc
6162
phenix (1.4.0)
6263
activerecord (>= 6.1)
6364
bundler
64-
prism (1.4.0)
65+
prism (1.6.0)
6566
pry (0.15.2)
6667
coderay (~> 1.1)
6768
method_source (~> 1.0)
@@ -70,20 +71,20 @@ GEM
7071
pry (>= 0.13, < 0.16)
7172
racc (1.8.1)
7273
rainbow (3.1.1)
73-
rake (13.3.0)
74-
regexp_parser (2.11.2)
75-
rubocop (1.75.8)
74+
rake (13.3.1)
75+
regexp_parser (2.11.3)
76+
rubocop (1.80.2)
7677
json (~> 2.3)
7778
language_server-protocol (~> 3.17.0.2)
7879
lint_roller (~> 1.1.0)
7980
parallel (~> 1.10)
8081
parser (>= 3.3.0.2)
8182
rainbow (>= 2.2.2, < 4.0)
8283
regexp_parser (>= 2.9.3, < 3.0)
83-
rubocop-ast (>= 1.44.0, < 2.0)
84+
rubocop-ast (>= 1.46.0, < 2.0)
8485
ruby-progressbar (~> 1.7)
8586
unicode-display_width (>= 2.4.0, < 4.0)
86-
rubocop-ast (1.46.0)
87+
rubocop-ast (1.48.0)
8788
parser (>= 3.3.7.2)
8889
prism (~> 1.4)
8990
rubocop-performance (1.25.0)
@@ -92,10 +93,10 @@ GEM
9293
rubocop-ast (>= 1.38.0, < 2.0)
9394
ruby-progressbar (1.13.0)
9495
securerandom (0.4.1)
95-
standard (1.50.0)
96+
standard (1.51.1)
9697
language_server-protocol (~> 3.17.0.2)
9798
lint_roller (~> 1.0)
98-
rubocop (~> 1.75.5)
99+
rubocop (~> 1.80.2)
99100
standard-custom (~> 1.0.0)
100101
standard-performance (~> 1.8)
101102
standard-custom (1.0.2)
@@ -108,16 +109,15 @@ GEM
108109
docker-api (~> 2.2)
109110
testcontainers-mysql (0.2.0)
110111
testcontainers-core (~> 0.1)
111-
timeout (0.4.3)
112+
timeout (0.4.4)
112113
trilogy (2.9.0)
113114
tzinfo (2.0.6)
114115
concurrent-ruby (~> 1.0)
115-
unicode-display_width (3.1.5)
116-
unicode-emoji (~> 4.0, >= 4.0.4)
117-
unicode-emoji (4.0.4)
116+
unicode-display_width (3.2.0)
117+
unicode-emoji (~> 4.1)
118+
unicode-emoji (4.1.0)
118119

119120
PLATFORMS
120-
arm64-darwin-21
121121
ruby
122122

123123
DEPENDENCIES

‎gemfiles/rails7.2.gemfile.lock‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (7.2.2.2)
11-
activesupport (= 7.2.2.2)
12-
activerecord (7.2.2.2)
13-
activemodel (= 7.2.2.2)
14-
activesupport (= 7.2.2.2)
10+
activemodel (7.2.3)
11+
activesupport (= 7.2.3)
12+
activerecord (7.2.3)
13+
activemodel (= 7.2.3)
14+
activesupport (= 7.2.3)
1515
timeout (>= 0.4.0)
16-
activesupport (7.2.2.2)
16+
activesupport (7.2.3)
1717
base64
1818
benchmark (>= 0.3)
1919
bigdecimal
@@ -27,41 +27,42 @@ GEM
2727
tzinfo (~> 2.0, >= 2.0.5)
2828
ast (2.4.3)
2929
base64 (0.3.0)
30-
benchmark (0.4.1)
31-
bigdecimal (3.2.2)
30+
benchmark (0.5.0)
31+
bigdecimal (3.3.1)
3232
byebug (12.0.0)
3333
coderay (1.1.3)
3434
concurrent-ruby (1.3.5)
35-
connection_pool (2.5.3)
35+
connection_pool (2.5.4)
3636
docker-api (2.4.0)
3737
excon (>= 0.64.0)
3838
multi_json
3939
drb (2.2.3)
40-
excon (1.3.0)
40+
excon (1.3.1)
4141
logger
4242
i18n (1.14.7)
4343
concurrent-ruby (~> 1.0)
44-
json (2.13.2)
44+
json (2.16.0)
4545
language_server-protocol (3.17.0.5)
4646
lint_roller (1.1.0)
4747
logger (1.7.0)
4848
method_source (1.1.0)
49-
minitest (5.25.5)
49+
minitest (5.26.1)
5050
minitest-fail-fast (0.1.0)
5151
minitest (~> 5)
5252
minitest-line (0.6.5)
5353
minitest (~> 5.0)
5454
minitest-mock_expectations (1.2.0)
5555
multi_json (1.17.0)
56-
mysql2 (0.5.6)
56+
mysql2 (0.5.7)
57+
bigdecimal
5758
parallel (1.27.0)
58-
parser (3.3.9.0)
59+
parser (3.3.10.0)
5960
ast (~> 2.4.1)
6061
racc
6162
phenix (1.4.0)
6263
activerecord (>= 6.1)
6364
bundler
64-
prism (1.4.0)
65+
prism (1.6.0)
6566
pry (0.15.2)
6667
coderay (~> 1.1)
6768
method_source (~> 1.0)
@@ -70,20 +71,20 @@ GEM
7071
pry (>= 0.13, < 0.16)
7172
racc (1.8.1)
7273
rainbow (3.1.1)
73-
rake (13.3.0)
74-
regexp_parser (2.11.2)
75-
rubocop (1.75.8)
74+
rake (13.3.1)
75+
regexp_parser (2.11.3)
76+
rubocop (1.80.2)
7677
json (~> 2.3)
7778
language_server-protocol (~> 3.17.0.2)
7879
lint_roller (~> 1.1.0)
7980
parallel (~> 1.10)
8081
parser (>= 3.3.0.2)
8182
rainbow (>= 2.2.2, < 4.0)
8283
regexp_parser (>= 2.9.3, < 3.0)
83-
rubocop-ast (>= 1.44.0, < 2.0)
84+
rubocop-ast (>= 1.46.0, < 2.0)
8485
ruby-progressbar (~> 1.7)
8586
unicode-display_width (>= 2.4.0, < 4.0)
86-
rubocop-ast (1.46.0)
87+
rubocop-ast (1.48.0)
8788
parser (>= 3.3.7.2)
8889
prism (~> 1.4)
8990
rubocop-performance (1.25.0)
@@ -92,10 +93,10 @@ GEM
9293
rubocop-ast (>= 1.38.0, < 2.0)
9394
ruby-progressbar (1.13.0)
9495
securerandom (0.4.1)
95-
standard (1.50.0)
96+
standard (1.51.1)
9697
language_server-protocol (~> 3.17.0.2)
9798
lint_roller (~> 1.0)
98-
rubocop (~> 1.75.5)
99+
rubocop (~> 1.80.2)
99100
standard-custom (~> 1.0.0)
100101
standard-performance (~> 1.8)
101102
standard-custom (1.0.2)
@@ -108,13 +109,13 @@ GEM
108109
docker-api (~> 2.2)
109110
testcontainers-mysql (0.2.0)
110111
testcontainers-core (~> 0.1)
111-
timeout (0.4.3)
112+
timeout (0.4.4)
112113
trilogy (2.9.0)
113114
tzinfo (2.0.6)
114115
concurrent-ruby (~> 1.0)
115-
unicode-display_width (3.1.5)
116-
unicode-emoji (~> 4.0, >= 4.0.4)
117-
unicode-emoji (4.0.4)
116+
unicode-display_width (3.2.0)
117+
unicode-emoji (~> 4.1)
118+
unicode-emoji (4.1.0)
118119

119120
PLATFORMS
120121
ruby

0 commit comments

Comments
 (0)
⚡