Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ script: "script/run_build 2>&1"
dist: trusty

matrix:
# temporary
allow_failures:
rvm: jruby-head

include:
# Rails 6 builds
- rvm: jruby-head
Expand Down
7 changes: 3 additions & 4 deletions features/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ routing.

## Rails

rspec-rails 3 supports Rails 3.x and 4.x. For earlier versions of Rails, you
need [rspec-rails 1](https://github.com/dchelimsky/rspec-rails). For Rails 5.x,
make sure you are using rspec-rails 3.5.0 or newer.
rspec-rails 4 supports Rails 5.x and 6.x. For earlier versions of Rails, you
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also in README:

**IMPORTANT** Note that rspec-rails 4.0 is still a release candidate

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

     # Note that rspec-rails 4.0 is still a pre release
     gem 'rspec-rails', '~> 4.0.0.rc1'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might want to update your master, thats gone 😂

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

features/upgrade/README.md needs some cleanup:

With the release of Rails 4, new APIs have been exposed on
`ActiveRecord::Migration`. This allows RSpec to take advantage of these new
standard migration checks, mirroring behavior across the board.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lib/generators/rspec/integration/integration_generator.rb:

      # Add a deprecation for this class, before rspec-rails 4, to use the
      # `RequestGenerator` instead

drop the file completely?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

features/upgrade/README.md might need some additions, but I hope user-submitted ones. Frankly I lost track of what has been added and what needs to be tweaked before updating rspec-rails on a project.

We should say goodbye to from_1x_to_2x.md.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all I could find.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pirj would you mind tackling those in another PR? I'm going to merge this to get the build green.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take care of it 👍

need [rspec-rails 3](https://github.com/rspec/rspec-rails/tree/3-9-maintenance).

## Install

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

group :test, :development do
gem 'rspec-rails', '~> 3.0.0'
gem 'rspec-rails', '~> 4.0.0'
end

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