Merge pull request rspec#458 from pda/master

Remove config.mock_with :rspec, avoid config-after-examples error.
seanmoon · Oct 31, 2011 · a5c0ee0 · a5c0ee0
2 parents 48d4cd3 + a5030df
commit a5c0ee0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/lib/generators/rspec/install/templates/spec/spec_helper.rb b/lib/generators/rspec/install/templates/spec/spec_helper.rb
@@ -16,7 +16,6 @@
   # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
-  config.mock_with :rspec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"