Skip to content

Commit e6dac03

Browse files
committed
Merge pull request #855 from rspec/remove_autorun
Remove `require 'rspec/autorun'` from the generated spec_helper.rb in 2.99 and 3.0.0
2 parents 2417545 + e40ab1e commit e6dac03

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

lib/generators/rspec/install/templates/spec/spec_helper.rb.tt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
ENV["RAILS_ENV"] ||= 'test'
33
require File.expand_path("../../config/environment", __FILE__)
44
require 'rspec/rails'
5-
require 'rspec/autorun'
65

76
# Requires supporting ruby files with custom matchers and macros, etc, in
87
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are

spec/generators/rspec/install/install_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
it "generates spec/spec_helper.rb" do
1515
run_generator
16-
File.read( file('spec/spec_helper.rb') ).should =~ /^require 'rspec\/autorun'$/m
16+
File.read( file('spec/spec_helper.rb') ).should =~ /^require 'rspec\/rails'$/m
1717
end
1818

1919
if ::Rails::VERSION::STRING >= '4'

0 commit comments

Comments
 (0)