Skip to content

Commit 06e2fdf

Browse files
JonRoweJonRowe
committed
Update supported versions
1 parent 620a869 commit 06e2fdf

File tree

4 files changed

+11
-63
lines changed

4 files changed

+11
-63
lines changed

‎.github/workflows/ci.yml

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,12 @@ jobs:
4141

4242
# Rails 7.0 builds >= 2.7
4343
- ruby: 3.1
44-
allow_failure: true
4544
env:
4645
RAILS_VERSION: '~> 7.0.0'
4746
- ruby: '3.0'
48-
allow_failure: true
4947
env:
5048
RAILS_VERSION: '~> 7.0.0'
5149
- ruby: 2.7
52-
allow_failure: true
5350
env:
5451
RAILS_VERSION: '~> 7.0.0'
5552

@@ -66,55 +63,6 @@ jobs:
6663
- ruby: 2.5
6764
env:
6865
RAILS_VERSION: '~> 6.1.0'
69-
- ruby: jruby-9.3.1.0
70-
env:
71-
RAILS_VERSION: '~> 6.1.0'
72-
JRUBY_OPT: '--dev'
73-
JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED'
74-
75-
# Rails 6.0 builds >= 2.5.0
76-
- ruby: '3.0'
77-
env:
78-
RAILS_VERSION: '~> 6.0.0'
79-
- ruby: 2.7
80-
env:
81-
RAILS_VERSION: '~> 6.0.0'
82-
- ruby: 2.6
83-
env:
84-
RAILS_VERSION: '~> 6.0.0'
85-
- ruby: 2.5
86-
env:
87-
RAILS_VERSION: '~> 6.0.0'
88-
- ruby: jruby-9.3.1.0
89-
env:
90-
RAILS_VERSION: '~> 6.0.0'
91-
JRUBY_OPT: '--dev'
92-
JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED'
93-
94-
# Rails 5.2 builds >= 2.2.2
95-
- ruby: 2.6.6
96-
env:
97-
RAILS_VERSION: '~> 5.2.0'
98-
- ruby: 2.5.8
99-
env:
100-
RAILS_VERSION: '~> 5.2.0'
101-
- ruby: 2.4.10
102-
env:
103-
RAILS_VERSION: '~> 5.2.0'
104-
- ruby: 2.3.8
105-
env:
106-
RAILS_VERSION: '~> 5.2.0'
107-
- ruby: 2.2.10
108-
env:
109-
RAILS_VERSION: '~> 5.2.0'
110-
- ruby: 2.2.10
111-
env:
112-
RAILS_VERSION: '5-2-stable'
113-
- ruby: jruby-9.3.1.0
114-
env:
115-
RAILS_VERSION: '~> 5.2.0'
116-
JRUBY_OPT: '--dev'
117-
JAVA_OPTS: '--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens java.base/java.io=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED'
11866

11967
env: ${{ matrix.env }}
12068
steps:

‎Gemfile-rails-dependencies

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ when /stable$/
2626
gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
2727
end
2828
when nil, false, ""
29-
add_net_gems_dependency # TODO: remove when we use switch to "~> 7.0.0" that declares dependency on those gems on itself
30-
gem "rails", "~> 6.0.0"
29+
gem "rails", "~> 7.0.0"
3130
gem "puma"
3231
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
3332
gem 'selenium-webdriver', require: false
3433
else
3534
add_net_gems_dependency if version.split(' ').last < '7.0'
3635
gem "rails", version
37-
gem "sprockets", '~> 3.0' if RUBY_VERSION < '2.5'
3836
gem "puma"
3937
gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
4038
gem 'selenium-webdriver', require: false

‎README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ detailed explanations of how the application is supposed to behave,
99
expressed in plain English.
1010

1111
According to [RSpec Rails new versioning strategy][] use:
12-
* **[`rspec-rails` 5.x][]** for Rails 6.x.
12+
* **[`rspec-rails` 6.x][]** for Rails 6.1 or 7.x.
13+
* **[`rspec-rails` 5.x][]** for Rails 5.2 or 6.x.
1314
* **[`rspec-rails` 4.x][]** for Rails from 5.x or 6.x.
1415
* **[`rspec-rails` 3.x][]** for Rails earlier than 5.0.
1516
* **[`rspec-rails` 1.x][]** for Rails 2.x.
@@ -25,21 +26,22 @@ According to [RSpec Rails new versioning strategy][] use:
2526
[`rspec-rails` 1.x]: https://github.com/dchelimsky/rspec-rails
2627
[`rspec-rails` 3.x]: https://github.com/rspec/rspec-rails/tree/3-9-maintenance
2728
[`rspec-rails` 4.x]: https://github.com/rspec/rspec-rails/tree/4-1-maintenance
28-
[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-0-maintenance
29+
[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-1-maintenance
30+
[`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-0-maintenance
2931
[RSpec Rails new versioning strategy]: https://github.com/rspec/rspec-rails/blob/main/rfcs/versioning-strategy.md
3032

3133
## Installation
3234

3335
**IMPORTANT** This README / branch refers to the current development build.
34-
See the [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/5-0-maintenance) if you want or require the latest stable release.
36+
See the [`6-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/6-0-maintenance) if you want or require the latest stable release.
3537

3638
1. Add `rspec-rails` to **both** the `:development` and `:test` groups
3739
of your app’s `Gemfile`:
3840

3941
```ruby
4042
# Run against this stable release
4143
group :development, :test do
42-
gem 'rspec-rails', '~> 5.0.0'
44+
gem 'rspec-rails', '~> 6.0.0'
4345
end
4446

4547
# Or, run against the main branch

‎rspec-rails.gemspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
1111
s.homepage = "https://github.com/rspec/rspec-rails"
1212
s.summary = "RSpec for Rails"
1313
s.description = "rspec-rails is a testing framework for Rails 5+."
14-
s.required_ruby_version = ">= 2.2.0"
14+
s.required_ruby_version = ">= 2.5.0"
1515

1616
s.metadata = {
1717
'bug_tracker_uri' => 'https://github.com/rspec/rspec-rails/issues',
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
3333
s.cert_chain = [File.expand_path('~/.gem/rspec-gem-public_cert.pem')]
3434
end
3535

36-
version_string = ['>= 5.2']
36+
version_string = ['>= 6.1']
3737

3838
s.add_runtime_dependency 'actionpack', version_string
3939
s.add_runtime_dependency 'activesupport', version_string
@@ -48,10 +48,10 @@ Gem::Specification.new do |s|
4848
if ENV['RSPEC_CI']
4949
s.add_runtime_dependency "rspec-#{name}", ENV.fetch('RSPEC_VERSION', '3.11.0.pre')
5050
elsif RSpec::Rails::Version::STRING =~ /pre/ # prerelease builds
51-
expected_rspec_version = "3.11.0.pre"
51+
expected_rspec_version = "3.12.0.pre"
5252
s.add_runtime_dependency "rspec-#{name}", "= #{expected_rspec_version}"
5353
else
54-
expected_rspec_version = "3.10.0"
54+
expected_rspec_version = "3.11.0"
5555
s.add_runtime_dependency "rspec-#{name}", "~> #{expected_rspec_version.split(".")[0..1].join(".")}"
5656
end
5757
end

0 commit comments

Comments
 (0)