Skip to content

Commit ec7f96c

Browse files
myronmarstonJonRowe
authored andcommitted
Revert "Ensure rspec core is loaded if rspec-rails is." (#1678)
This reverts commit 994cb7a. The original fix was never shown to have fixed anything, and looks to have triggered #1645 and rspec/rspec-core#2301. Fixes #1645.
1 parent bae935c commit ec7f96c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Changelog.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ Enhancements:
55

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

8+
Bug Fixes:
9+
10+
* Stop unnecessarily loading `rspec/core` from `rspec/rails` to avoid
11+
IRB context warning. (Myron Marston, #1678)
12+
813
### 3.5.1 / 2016-07-08
914
[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.5.0...v3.5.1)
1015

11-
Bugfixes:
16+
Bug Fixes:
1217

1318
* Only attempt to load `ActionDispatch::IntegrationTest::Behavior` on Rails 5,
1419
and above; Prevents possible `TypeError` when an existing `Behaviour` class

lib/rspec-rails.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Explicitly require rspec-core for weird spring issue, see #1558
2-
require 'rspec/core'
31
require 'rspec/rails/feature_check'
42

53
# Namespace for all core RSpec projects.

0 commit comments

Comments
 (0)