Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Ensure rspec core is loaded if rspec-rails is." #1678

Merged
merged 1 commit into from
Jul 23, 2016
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
7 changes: 6 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ Enhancements:

* Add support for `rake notes` in Rails `>= 5.1`. (John Meehan, #1661)

Bug Fixes:

* Stop unnecessarily loading `rspec/core` from `rspec/rails` to avoid
IRB context warning. (Myron Marston, #1678)

### 3.5.1 / 2016-07-08
[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.5.0...v3.5.1)

Bugfixes:
Bug Fixes:

* Only attempt to load `ActionDispatch::IntegrationTest::Behavior` on Rails 5,
and above; Prevents possible `TypeError` when an existing `Behaviour` class
Expand Down
2 changes: 0 additions & 2 deletions lib/rspec-rails.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Explicitly require rspec-core for weird spring issue, see #1558
require 'rspec/core'
require 'rspec/rails/feature_check'

# Namespace for all core RSpec projects.
Expand Down