Skip to content

Commit 6d23672

Browse files
authored
Merge pull request #703 from kbrock/ruby_34
support ruby 3.4
2 parents 6714448 + 4ae2d7e commit 6d23672

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

.github/workflows/run_test_suite.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,32 @@ jobs:
4242
# - https://www.ruby-lang.org/en/downloads/branches/
4343
# - https://guides.rubyonrails.org/maintenance_policy.html
4444
format: [materialized_path, materialized_path2]
45-
activerecord: [70, 71, 72, 80]
45+
activerecord: [71, 72, 80]
4646
ruby: [3.2, 3.3]
4747
# additional tests
4848
include:
4949
# EOL 6/2022 (ruby >= 2.2.2, <2.7)
50-
- ruby: 2.6
50+
- format: materialized_path2
5151
activerecord: 52
52+
ruby: 2.6
5253
# EOL 2023
53-
- ruby: 2.7
54+
- format: materialized_path2
5455
activerecord: 60
56+
ruby: 2.7
5557
# rails 6.1 and 7.0 have different ruby versions
56-
- ruby: 2.7
58+
- format: materialized_path2
5759
activerecord: 61
58-
- ruby: "3.0"
60+
ruby: 2.7
61+
- format: materialized_path2
5962
activerecord: 61
63+
ruby: "3.0"
64+
- format: materialized_path2
65+
activerecord: 70
66+
ruby: "3.0"
67+
# active record 7.0 and 3.4 was failing
68+
- format: materialized_path2
69+
activerecord: 80
70+
ruby: "3.4"
6071
env:
6172
# for the pg cli (psql, pg_isready) and possibly rails
6273
PGHOST: 127.0.0.1 # container is mapping it locally

test/environment.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def self.with_model(options = {})
152152
end
153153
end
154154

155-
testmethod = caller[0][/`.*'/][1..-2]
155+
testmethod = caller[0].match(/[`'](?:[^#]*#)?([^']*)'/)[1]
156156
model_name = "#{testmethod.camelize}TestNode"
157157

158158
begin

0 commit comments

Comments
 (0)