Merge pull request #1305 from rspec/fix-generator-dep

JonRowe · JonRowe · commit caf9d627858a · 2015-02-11T09:28:29.000+11:00
Add missing `require` to RSpec generator root
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,10 @@
+### Development
+
+Bug Fixes:
+
+* Add missing `require` to RSpec generator root fixing an issue where Rail's
+  autoload does not find it in some environments. (Aaron Kromer, #1305)
+
 ### 3.2.0 / 2015-02-03
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.1.0...v3.2.0)
 
diff --git a/lib/generators/rspec.rb b/lib/generators/rspec.rb
@@ -1,4 +1,5 @@
 require 'rails/generators/named_base'
+require 'rspec/rails/feature_check'
 
 # Weirdly named generators namespace (should be `RSpec`) for compatability with
 # rails loading.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require 'rails/generators/named_base'`
	`2`	`+require 'rspec/rails/feature_check'`
`2`	`3`
`3`	`4`	# Weirdly named generators namespace (should be `RSpec`) for compatability with
`4`	`5`	`# rails loading.`