diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:41:52 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 10:41:52 -0700 |
| commit | d6d23b495cda0e154b4e73982acc43e586564c0e (patch) | |
| tree | 8a737533940ddd4c6ea9ac4170a9e2f58ffa2709 /spec/spec_helper.rb | |
| parent | 74e6411157b8df1af9a24c17971e3236f3096529 (diff) | |
Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
This reverts commit 74e6411157b8df1af9a24c17971e3236f3096529, reversing
changes made to 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd.
Here's why:
Actually... I just screwed this up.
I merged this new fact into 2.4.x but it's not fixing any bug. It's adding a
new fact, so this should go into master and we should release 2.5 since this is
new, backwards-compatible functionality.
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 931d35c..8ae9ad3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,17 +12,3 @@ 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 |