summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 15:43:51 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 15:43:51 -0700
commit2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0 (patch)
treebb8d8d9e523099649b196b860822385ef8ffc29b /spec/spec_helper.rb
parent1d371ab8b67b85d52f8c4932f78660de8a236b93 (diff)
parent9e8c60a8b73fd96393b08d690c7197e62aae623e (diff)
downloadpuppet-stdlib-2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0.tar.gz
puppet-stdlib-2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0.tar.bz2
Merge branch '3.0.x' into 3.1.x
* 3.0.x: Revert "Merge branch '2.5.x' into 3.0.x"
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb15
1 files changed, 0 insertions, 15 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 931d35c..e269b90 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -11,18 +11,3 @@ gem 'rspec', '>=2.0.0'
require 'rspec/expectations'
require 'puppetlabs_spec_helper/module_spec_helper'
-
-RSpec.configure do |config|
- # FIXME REVISIT - We may want to delegate to Facter like we do in
- # Puppet::PuppetSpecInitializer.initialize_via_testhelper(config) because
- # this behavior is a duplication of the spec_helper in Facter.
- config.before :each do
- # Ensure that we don't accidentally cache facts and environment between
- # test cases. This requires each example group to explicitly load the
- # facts being exercised with something like
- # Facter.collection.loader.load(:ipaddress)
- Facter::Util::Loader.any_instance.stubs(:load_all)
- Facter.clear
- Facter.clear_messages
- end
-end