diff options
author | Claire McQuin <claire@getchef.com> | 2015-07-09 13:35:27 -0700 |
---|---|---|
committer | Claire McQuin <claire@getchef.com> | 2015-07-21 09:47:50 -0700 |
commit | 68506520e8962ae685a551bfb3594272c68d31f0 (patch) | |
tree | 21860f72dd4e0ba562e56aacfe82a5367c022015 /spec/spec_helper.rb | |
parent | 542eebb54f20bde83612cff37ea1d7156ca0ffd1 (diff) | |
download | ohai-68506520e8962ae685a551bfb3594272c68d31f0.tar.gz |
Use Ohai.config
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7017d985..8d561ea8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,7 @@ require 'spec/support/platform_helpers' require 'spec/support/integration_helper' require 'wmi-lite' require 'ohai' -Ohai::Config[:log_level] = :error +Ohai.config[:log_level] = :error PLUGIN_PATH = File.expand_path("../../lib/ohai/plugins", __FILE__) SPEC_PLUGIN_PATH = File.expand_path("../data/plugins", __FILE__) @@ -118,6 +118,10 @@ RSpec.configure do |config| config.run_all_when_everything_filtered = true config.before :each do + # TODO: Change to Ohai.config once Ohai::Config is deprecated fully. Needs + # to stay Ohai::Config for now so that top-level attributes will get cleared + # out between tests (config_spec should be the only place where top-level + # config attributes are set). Ohai::Config.reset end end |