Skip to content

Commit ddbe67d

Browse files
authored
Merge pull request #2297 from rspec/update-docs-for-rails-4
Update docs for rspec-rails 4
2 parents 38c8aad + 3e36b8f commit ddbe67d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ script: "script/run_build 2>&1"
4343
dist: trusty
4444

4545
matrix:
46+
# temporary
47+
allow_failures:
48+
rvm: jruby-head
49+
4650
include:
4751
# Rails 6 builds
4852
- rvm: jruby-head

features/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ routing.
44

55
## Rails
66

7-
rspec-rails 3 supports Rails 3.x and 4.x. For earlier versions of Rails, you
8-
need [rspec-rails 1](https://github.com/dchelimsky/rspec-rails). For Rails 5.x,
9-
make sure you are using rspec-rails 3.5.0 or newer.
7+
rspec-rails 4 supports Rails 5.x and 6.x. For earlier versions of Rails, you
8+
need [rspec-rails 3](https://github.com/rspec/rspec-rails/tree/3-9-maintenance).
109

1110
## Install
1211

@@ -25,7 +24,7 @@ This installs the following gems:
2524
Add rspec-rails to the :test and :development groups in the Gemfile:
2625

2726
group :test, :development do
28-
gem 'rspec-rails', '~> 3.0.0'
27+
gem 'rspec-rails', '~> 4.0.0'
2928
end
3029

3130
It needs to be in the :development group to expose generators and rake tasks

0 commit comments

Comments
 (0)