Skip to content

Commit 2159235

Browse files
daschdasch
authored
Merge branch 'main' into trusted_publishing
2 parents 89b7362 + 0549868 commit 2159235

File tree

7 files changed

+519
-1
lines changed

7 files changed

+519
-1
lines changed

‎.github/workflows/ci.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,28 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
ruby:
15-
- '3.1'
1615
- '3.2'
1716
- '3.3'
17+
- '3.4'
1818
gemfile:
1919
- rails6.1
2020
- rails7.0
2121
- rails7.1
22+
- rails7.2
23+
- rails8.0
2224
- rails_main
25+
include:
26+
- ruby: '3.1'
27+
gemfile: rails6.1
28+
- ruby: '3.1'
29+
gemfile: rails7.0
30+
- ruby: '3.1'
31+
gemfile: rails7.1
32+
exclude:
33+
- ruby: '3.4'
34+
gemfile: rails6.1
35+
- ruby: '3.4'
36+
gemfile: rails7.0
2337
steps:
2438
- uses: actions/checkout@v4
2539
- uses: ruby/setup-ruby@v1

‎.rspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
-r spec_helper
2+
--order random

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
### Unreleased
2+
* Add tests with Rails 7.2 and 8.0
3+
* Add tests with Ruby 3.4
24

35
### Curly 3.4.0 (July 2, 2024)
46
* Drop upper limit on Rails, test with Rails main.

‎gemfiles/rails7.2.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eval_gemfile 'common.rb'
2+
3+
gem 'rails', '~> 7.2.0'
4+
gem 'genspec', github: 'zendesk/genspec', branch: 'rails-7'

‎gemfiles/rails7.2.gemfile.lock

Lines changed: 246 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,246 @@
1+
GIT
2+
remote: https://github.com/zendesk/genspec.git
3+
revision: 76116991caf40ef940076f702f70a141ced84ce2
4+
branch: rails-7
5+
specs:
6+
genspec (0.3.2)
7+
rspec (>= 2, < 4)
8+
thor
9+
10+
PATH
11+
remote: ..
12+
specs:
13+
curly-templates (3.4.0)
14+
actionpack (>= 6.1)
15+
sorted_set
16+
17+
GEM
18+
remote: https://rubygems.org/
19+
specs:
20+
actioncable (7.2.2.1)
21+
actionpack (= 7.2.2.1)
22+
activesupport (= 7.2.2.1)
23+
nio4r (~> 2.0)
24+
websocket-driver (>= 0.6.1)
25+
zeitwerk (~> 2.6)
26+
actionmailbox (7.2.2.1)
27+
actionpack (= 7.2.2.1)
28+
activejob (= 7.2.2.1)
29+
activerecord (= 7.2.2.1)
30+
activestorage (= 7.2.2.1)
31+
activesupport (= 7.2.2.1)
32+
mail (>= 2.8.0)
33+
actionmailer (7.2.2.1)
34+
actionpack (= 7.2.2.1)
35+
actionview (= 7.2.2.1)
36+
activejob (= 7.2.2.1)
37+
activesupport (= 7.2.2.1)
38+
mail (>= 2.8.0)
39+
rails-dom-testing (~> 2.2)
40+
actionpack (7.2.2.1)
41+
actionview (= 7.2.2.1)
42+
activesupport (= 7.2.2.1)
43+
nokogiri (>= 1.8.5)
44+
racc
45+
rack (>= 2.2.4, < 3.2)
46+
rack-session (>= 1.0.1)
47+
rack-test (>= 0.6.3)
48+
rails-dom-testing (~> 2.2)
49+
rails-html-sanitizer (~> 1.6)
50+
useragent (~> 0.16)
51+
actiontext (7.2.2.1)
52+
actionpack (= 7.2.2.1)
53+
activerecord (= 7.2.2.1)
54+
activestorage (= 7.2.2.1)
55+
activesupport (= 7.2.2.1)
56+
globalid (>= 0.6.0)
57+
nokogiri (>= 1.8.5)
58+
actionview (7.2.2.1)
59+
activesupport (= 7.2.2.1)
60+
builder (~> 3.1)
61+
erubi (~> 1.11)
62+
rails-dom-testing (~> 2.2)
63+
rails-html-sanitizer (~> 1.6)
64+
activejob (7.2.2.1)
65+
activesupport (= 7.2.2.1)
66+
globalid (>= 0.3.6)
67+
activemodel (7.2.2.1)
68+
activesupport (= 7.2.2.1)
69+
activerecord (7.2.2.1)
70+
activemodel (= 7.2.2.1)
71+
activesupport (= 7.2.2.1)
72+
timeout (>= 0.4.0)
73+
activestorage (7.2.2.1)
74+
actionpack (= 7.2.2.1)
75+
activejob (= 7.2.2.1)
76+
activerecord (= 7.2.2.1)
77+
activesupport (= 7.2.2.1)
78+
marcel (~> 1.0)
79+
activesupport (7.2.2.1)
80+
base64
81+
benchmark (>= 0.3)
82+
bigdecimal
83+
concurrent-ruby (~> 1.0, >= 1.3.1)
84+
connection_pool (>= 2.2.5)
85+
drb
86+
i18n (>= 1.6, < 2)
87+
logger (>= 1.4.2)
88+
minitest (>= 5.1)
89+
securerandom (>= 0.3)
90+
tzinfo (~> 2.0, >= 2.0.5)
91+
base64 (0.2.0)
92+
benchmark (0.4.0)
93+
benchmark-ips (2.14.0)
94+
bigdecimal (3.1.9)
95+
builder (3.3.0)
96+
concurrent-ruby (1.3.4)
97+
connection_pool (2.4.1)
98+
crass (1.0.6)
99+
date (3.4.1)
100+
diff-lcs (1.5.1)
101+
drb (2.2.1)
102+
erubi (1.13.1)
103+
github-markup (5.0.1)
104+
globalid (1.2.1)
105+
activesupport (>= 6.1)
106+
i18n (1.14.6)
107+
concurrent-ruby (~> 1.0)
108+
io-console (0.8.0)
109+
irb (1.14.3)
110+
rdoc (>= 4.0.0)
111+
reline (>= 0.4.2)
112+
logger (1.6.4)
113+
loofah (2.23.1)
114+
crass (~> 1.0.2)
115+
nokogiri (>= 1.12.0)
116+
mail (2.8.1)
117+
mini_mime (>= 0.1.1)
118+
net-imap
119+
net-pop
120+
net-smtp
121+
marcel (1.0.4)
122+
mini_mime (1.1.5)
123+
mini_portile2 (2.8.8)
124+
minitest (5.25.4)
125+
net-imap (0.5.4)
126+
date
127+
net-protocol
128+
net-pop (0.1.2)
129+
net-protocol
130+
net-protocol (0.2.2)
131+
timeout
132+
net-smtp (0.5.0)
133+
net-protocol
134+
nio4r (2.7.4)
135+
nokogiri (1.18.1)
136+
mini_portile2 (~> 2.8.2)
137+
racc (~> 1.4)
138+
psych (5.2.2)
139+
date
140+
stringio
141+
racc (1.8.1)
142+
rack (3.1.8)
143+
rack-session (2.0.0)
144+
rack (>= 3.0.0)
145+
rack-test (2.2.0)
146+
rack (>= 1.3)
147+
rackup (2.2.1)
148+
rack (>= 3)
149+
rails (7.2.2.1)
150+
actioncable (= 7.2.2.1)
151+
actionmailbox (= 7.2.2.1)
152+
actionmailer (= 7.2.2.1)
153+
actionpack (= 7.2.2.1)
154+
actiontext (= 7.2.2.1)
155+
actionview (= 7.2.2.1)
156+
activejob (= 7.2.2.1)
157+
activemodel (= 7.2.2.1)
158+
activerecord (= 7.2.2.1)
159+
activestorage (= 7.2.2.1)
160+
activesupport (= 7.2.2.1)
161+
bundler (>= 1.15.0)
162+
railties (= 7.2.2.1)
163+
rails-dom-testing (2.2.0)
164+
activesupport (>= 5.0.0)
165+
minitest
166+
nokogiri (>= 1.6)
167+
rails-html-sanitizer (1.6.2)
168+
loofah (~> 2.21)
169+
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
170+
railties (7.2.2.1)
171+
actionpack (= 7.2.2.1)
172+
activesupport (= 7.2.2.1)
173+
irb (~> 1.13)
174+
rackup (>= 1.0.0)
175+
rake (>= 12.2)
176+
thor (~> 1.0, >= 1.2.2)
177+
zeitwerk (~> 2.6)
178+
rake (13.2.1)
179+
rbtree (0.4.6)
180+
rdoc (6.10.0)
181+
psych (>= 4.0.0)
182+
redcarpet (3.6.0)
183+
reline (0.6.0)
184+
io-console (~> 0.5)
185+
rspec (3.13.0)
186+
rspec-core (~> 3.13.0)
187+
rspec-expectations (~> 3.13.0)
188+
rspec-mocks (~> 3.13.0)
189+
rspec-core (3.13.2)
190+
rspec-support (~> 3.13.0)
191+
rspec-expectations (3.13.3)
192+
diff-lcs (>= 1.2.0, < 2.0)
193+
rspec-support (~> 3.13.0)
194+
rspec-mocks (3.13.2)
195+
diff-lcs (>= 1.2.0, < 2.0)
196+
rspec-support (~> 3.13.0)
197+
rspec-rails (7.1.0)
198+
actionpack (>= 7.0)
199+
activesupport (>= 7.0)
200+
railties (>= 7.0)
201+
rspec-core (~> 3.13)
202+
rspec-expectations (~> 3.13)
203+
rspec-mocks (~> 3.13)
204+
rspec-support (~> 3.13)
205+
rspec-support (3.13.2)
206+
securerandom (0.4.1)
207+
set (1.1.1)
208+
sorted_set (1.0.3)
209+
rbtree
210+
set (~> 1.0)
211+
stackprof (0.2.26)
212+
stringio (3.1.2)
213+
thor (1.3.2)
214+
timeout (0.4.3)
215+
tomparse (0.4.2)
216+
tzinfo (2.0.6)
217+
concurrent-ruby (~> 1.0)
218+
useragent (0.16.11)
219+
websocket-driver (0.7.6)
220+
websocket-extensions (>= 0.1.0)
221+
websocket-extensions (0.1.5)
222+
yard (0.9.37)
223+
yard-tomdoc (0.7.1)
224+
tomparse (>= 0.4.0)
225+
yard
226+
zeitwerk (2.7.1)
227+
228+
PLATFORMS
229+
ruby
230+
231+
DEPENDENCIES
232+
benchmark-ips
233+
curly-templates!
234+
genspec!
235+
github-markup
236+
rails (~> 7.2.0)
237+
rake
238+
redcarpet
239+
rspec (>= 3)
240+
rspec-rails
241+
stackprof
242+
yard
243+
yard-tomdoc
244+
245+
BUNDLED WITH
246+
2.5.17

‎gemfiles/rails8.0.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eval_gemfile 'common.rb'
2+
3+
gem 'rails', '~> 8.0.0'
4+
gem 'genspec', github: 'zendesk/genspec', branch: 'rails-8'

0 commit comments

Comments
 (0)