From 8987682c977d56717750a3c737fd8c56e9670a11 Mon Sep 17 00:00:00 2001 From: Claire McQuin Date: Wed, 16 Oct 2013 18:52:06 -0700 Subject: update spec_helper, system_spec to Ohai::Mixin::OS --- spec/spec_helper.rb | 2 +- spec/unit/system_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ad2996b7..580ca9af 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -46,7 +46,7 @@ def strict_const_defined?(object, const) end end -if Ohai::OS.collect_os == /mswin|mingw32|windows/ +if Ohai::Mixin::OS.collect_os == /mswin|mingw32|windows/ ENV["PATH"] = "" end diff --git a/spec/unit/system_spec.rb b/spec/unit/system_spec.rb index dd7c83f0..b6607624 100644 --- a/spec/unit/system_spec.rb +++ b/spec/unit/system_spec.rb @@ -40,7 +40,7 @@ describe "Ohai::System" do describe "#load_plugins" do before(:each) do - Ohai::OS.stub(:collect_os).and_return("ubuntu") + Ohai::Mixin::OS.stub(:collect_os).and_return("ubuntu") loader = double('@loader') Ohai::Loader.stub(:new) { loader } @@ -70,7 +70,7 @@ describe "Ohai::System" do it "should add loaded plugins to @v6_dependency_solver" do Ohai::Config[:plugin_path] = ["/tmp/plugins"] - Ohai::OS.stub(:collect_os).and_return("ubuntu") + Ohai::Mixin::OS.stub(:collect_os).and_return("ubuntu") Dir.should_receive(:[]).with("/tmp/plugins/*").and_return(["/tmp/plugins/empty.rb"]) Dir.should_receive(:[]).with("/tmp/plugins/ubuntu/**/*").and_return([]) File.stub(:expand_path).with("/tmp/plugins").and_return("/tmp/plugins") -- cgit v1.2.1