diff options
| author | TP Honey <tphoney@users.noreply.github.com> | 2015-05-05 14:35:48 +0100 |
|---|---|---|
| committer | TP Honey <tphoney@users.noreply.github.com> | 2015-05-05 14:35:48 +0100 |
| commit | 7181e4ebcaf59cb16e7166aa254cbb637590423a (patch) | |
| tree | 3b45b6b6e4ef0a249096ed827d2599e80100ec57 /spec/spec_helper.rb | |
| parent | c7a23b226d5293e24cc52229c6162425ad473b6f (diff) | |
| parent | d4f3d57f1678ae03a58a17181f863c44c248f09b (diff) | |
| download | puppet-stdlib-7181e4ebcaf59cb16e7166aa254cbb637590423a.tar.gz puppet-stdlib-7181e4ebcaf59cb16e7166aa254cbb637590423a.tar.bz2 | |
Merge pull request #443 from DavidS/prep-work-for-new-specs
Prep work for new specs
Diffstat (limited to 'spec/spec_helper.rb')
| -rwxr-xr-x | spec/spec_helper.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b490ca3..896cb83 100755 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,9 +17,7 @@ require 'puppet_spec/fixtures' require 'puppet_spec/matchers' require 'puppet_spec/database' require 'monkey_patches/alias_should_to_must' -require 'mocha/setup' - - +require 'mocha/api' RSpec.configure do |config| config.before :each do @@ -27,8 +25,9 @@ RSpec.configure do |config| # 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 + + Puppet[:parser] = 'future' if ENV['FUTURE_PARSER'] == 'yes' end end |