diff options
| author | Claire McQuin <claire@opscode.com> | 2013-10-16 18:52:06 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@opscode.com> | 2013-10-17 12:07:31 -0700 |
| commit | 8987682c977d56717750a3c737fd8c56e9670a11 (patch) | |
| tree | f4e7400f091225f02b521627483af77f245e945b /spec | |
| parent | 2531afecc141c8a19ba8e8b2958cb275bb647fa5 (diff) | |
| download | ohai-8987682c977d56717750a3c737fd8c56e9670a11.tar.gz | |
update spec_helper, system_spec to Ohai::Mixin::OS
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 2 | ||||
| -rw-r--r-- | spec/unit/system_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
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") |