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

myronmarston · sebjacobs · commit 78c9c28f1169 · 2019-03-15T17:37:37.000Z
This reverts commit 994cb7a. The original fix was never shown to have fixed anything, and looks to have triggered rspec#1645 and rspec/rspec-core#2301. Fixes rspec#1645.
diff --git a/Changelog.md b/Changelog.md
@@ -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
diff --git a/lib/rspec-rails.rb b/lib/rspec-rails.rb
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# Explicitly require rspec-core for weird spring issue, see #1558`
`2`		`-require 'rspec/core'`
`3`	`1`	`require 'rspec/rails/feature_check'`
`4`	`2`
`5`	`3`	`# Namespace for all core RSpec projects.`