Skip to content

Commit b3cbbaf

Browse files
pirjJonRowe
authored andcommitted
Merge pull request #2313 from rspec/update-docs
Update docs for RSpec Rails 4.0
1 parent 7b9fd02 commit b3cbbaf

File tree

3 files changed

+5
-124
lines changed

3 files changed

+5
-124
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ They’re also specifications (or _specs,_ for short):
88
detailed explanations of how the application is supposed to behave,
99
expressed in plain English.
1010

11+
Use **[`rspec-rails` 3.x][]** for Rails earlier than 5.0.
1112
Use **[`rspec-rails` 1.x][]** for Rails 2.x.
1213

1314
[Build Status]: https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=master
@@ -19,6 +20,7 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
1920
[RSpec]: https://rspec.info/
2021
[Ruby on Rails]: https://rubyonrails.org/
2122
[`rspec-rails` 1.x]: https://github.com/dchelimsky/rspec-rails
23+
[`rspec-rails` 3.x]: https://github.com/rspec/rspec-rails/tree/3-9-maintenance
2224

2325
## Installation
2426

@@ -187,8 +189,8 @@ to test the various parts of a Rails system:
187189
| [`be_a_new`][] | | all | primarily intended for controller specs |
188190
| [`render_template`][] | `assert_template` | request / controller / view | use with `expect(response).to` |
189191
| [`redirect_to`][] | `assert_redirect` | request / controller | use with `expect(response).to` |
190-
| [`route_to`] | `assert_routing` | routing / controller | replaces `route_for` from version 1.x |
191-
| [`be_routable`] | | routing / controller | usu. for `expect(...).not_to be_routable` |
192+
| [`route_to`] | `assert_routing` | routing / controller | use with `expect(...).to route_to` |
193+
| [`be_routable`] | | routing / controller | use with `expect(...).not_to be_routable` |
192194
| [`have_http_status`][] | | request / controller / feature | |
193195
| [`match_array`][] | | all | for comparing arrays of ActiveRecord objects |
194196
| [`have_been_enqueued`][] | | all | requires config: `ActiveJob::Base.queue_adapter = :test` |

README_DEV.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ Rails than you are trying to use now.
3434
To run the specs against a different version of Rails, use the `thor` command:
3535

3636
```bash
37-
bin/thor version:use 3.2.13
37+
bin/thor version:use 6.0.2.2
3838
bin/rake
3939
```

features/upgrade/from_1x_to_2x.md

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)