ohai 7.6.0.rc.1 → 8.0.1

data/spec/unit/plugins/go_spec.rb

@@ -21,24 +21,24 @@ describe Ohai::System, "plugin go" do
     @plugin = get_plugin("go")
     @plugin[:languages] = Mash.new
     @stdout = "go version go1.1.2 darwin/amd64\n"
-    @plugin.stub(:shell_out).with("go version").and_return(mock_shell_out(0, @stdout, ""))
+    allow(@plugin).to receive(:shell_out).with("go version").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the go version" do
-    @plugin.should_receive(:shell_out).with("go version").and_return(mock_shell_out(0, @stdout, ""))
+    expect(@plugin).to receive(:shell_out).with("go version").and_return(mock_shell_out(0, @stdout, ""))
     @plugin.run
   end
 
   it "should set languages[:go][:version]" do
     @plugin.run
-    @plugin.languages[:go][:version].should eql("1.1.2")
+    expect(@plugin.languages[:go][:version]).to eql("1.1.2")
   end
 
   it "should not set the languages[:go] tree up if go command fails" do
     @stdout = "go version go1.1.2 darwin/amd64\n"
-    @plugin.stub(:shell_out).with("go version").and_return(mock_shell_out(1, @stdout, ""))
+    allow(@plugin).to receive(:shell_out).with("go version").and_return(mock_shell_out(1, @stdout, ""))
     @plugin.run
-    @plugin.languages.should_not have_key(:go)
+    expect(@plugin.languages).not_to have_key(:go)
   end
 
 end

data/spec/unit/plugins/groovy_spec.rb

@@ -25,23 +25,23 @@ describe Ohai::System, "plugin groovy" do
     @plugin = get_plugin("groovy")
     @plugin[:languages] = Mash.new
     @stdout = "Groovy Version: 1.6.3 JVM: 1.6.0_0\n"
-    @plugin.stub(:shell_out).with("groovy -v").and_return(mock_shell_out(0, @stdout, ""))
+    allow(@plugin).to receive(:shell_out).with("groovy -v").and_return(mock_shell_out(0, @stdout, ""))
   end
 
   it "should get the groovy version from running groovy -v" do
-    @plugin.should_receive(:shell_out).with("groovy -v").and_return(mock_shell_out(0, @stdout, ""))
+    expect(@plugin).to receive(:shell_out).with("groovy -v").and_return(mock_shell_out(0, @stdout, ""))
     @plugin.run
   end
 
   it "should set languages[:groovy][:version]" do
     @plugin.run
-    @plugin.languages[:groovy][:version].should eql("1.6.3")
+    expect(@plugin.languages[:groovy][:version]).to eql("1.6.3")
   end
 
   it "should not set the languages[:groovy] tree up if groovy command fails" do
-    @plugin.stub(:shell_out).with("groovy -v").and_return(mock_shell_out(1, @stdout, ""))
+    allow(@plugin).to receive(:shell_out).with("groovy -v").and_return(mock_shell_out(1, @stdout, ""))
     @plugin.run
-    @plugin.languages.should_not have_key(:groovy)
+    expect(@plugin.languages).not_to have_key(:groovy)
   end
 
 end

data/spec/unit/plugins/hostname_spec.rb

@@ -22,95 +22,95 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 describe Ohai::System, "hostname plugin" do
   before(:each) do
     @plugin = get_plugin("hostname")
-    @plugin.stub(:collect_os).and_return(:default)
-    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:default)
+    allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
   end
 
   context "when sigar is not installed" do
     before(:each) do
-      @plugin.stub(:sigar_is_available?).and_return(false)
-      @plugin.should_not_receive(:get_fqdn_from_sigar)
-      @plugin.stub(:resolve_fqdn).and_return("katie.bethell")
+      allow(@plugin).to receive(:sigar_is_available?).and_return(false)
+      expect(@plugin).not_to receive(:get_fqdn_from_sigar)
+      allow(@plugin).to receive(:resolve_fqdn).and_return("katie.bethell")
     end
     it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
 
     it "should use #resolve_fqdn to find the fqdn" do
       @plugin.run
-      @plugin[:fqdn].should == "katie.bethell"
+      expect(@plugin[:fqdn]).to eq("katie.bethell")
     end
 
     it "should set the domain to everything after the first dot of the fqdn" do
       @plugin.run
-      @plugin[:domain].should == "bethell"
+      expect(@plugin[:domain]).to eq("bethell")
     end
 
     it "should set the [short] hostname to everything before the first dot of the fqdn" do
       @plugin.run
-      @plugin[:hostname].should == "katie"
+      expect(@plugin[:hostname]).to eq("katie")
     end
   end
 
   context "when sigar is installed" do
     before(:each) do
-      @plugin.stub(:sigar_is_available?).and_return(true)
-      @plugin.stub(:get_fqdn_from_sigar).and_return("katie.bethell")
+      allow(@plugin).to receive(:sigar_is_available?).and_return(true)
+      allow(@plugin).to receive(:get_fqdn_from_sigar).and_return("katie.bethell")
     end
     it_should_check_from("linux::hostname", "machinename", "hostname", "katie.local")
     it "should set the fqdn to the returned value from sigar" do
       @plugin.run
-      @plugin[:fqdn].should == "katie.bethell"
+      expect(@plugin[:fqdn]).to eq("katie.bethell")
     end
 
     it "should set the domain to everything after the first dot of the fqdn" do
       @plugin.run
-      @plugin[:domain].should == "bethell"
+      expect(@plugin[:domain]).to eq("bethell")
     end
 
     it "should set the [short] hostname to everything before the first dot of the fqdn" do
       @plugin.run
-      @plugin[:hostname].should == "katie"
+      expect(@plugin[:hostname]).to eq("katie")
     end
   end
 
   context "when a system has a bare hostname without a FQDN" do
     before(:each) do
-      @plugin.stub(:collect_os).and_return(:default)
-      @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie", ""))
+      allow(@plugin).to receive(:collect_os).and_return(:default)
+      allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie", ""))
     end
 
     it "should correctly set the [short] hostname" do
       @plugin.run
-      @plugin[:hostname].should == "katie"
+      expect(@plugin[:hostname]).to eq("katie")
     end
   end
 
   context "hostname --fqdn when it returns empty string" do
     before(:each) do
-      @plugin.stub(:collect_os).and_return(:linux)
-      @plugin.stub(:shell_out).with("hostname -s").and_return(
+      allow(@plugin).to receive(:collect_os).and_return(:linux)
+      allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(
         mock_shell_out(0, "katie", ""))
-      @plugin.stub(:shell_out).with("hostname --fqdn").and_return(
+      allow(@plugin).to receive(:shell_out).with("hostname --fqdn").and_return(
         mock_shell_out(0, "", ""), mock_shell_out(0, "katie.local", ""))
     end
 
     it "should be called twice" do
       @plugin.run
-      @plugin[:fqdn].should == "katie.local"
+      expect(@plugin[:fqdn]).to eq("katie.local")
     end
   end
 
   context "hostname --fqdn when it works" do
     before(:each) do
-      @plugin.stub(:collect_os).and_return(:linux)
-      @plugin.stub(:shell_out).with("hostname -s").and_return(
+      allow(@plugin).to receive(:collect_os).and_return(:linux)
+      allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(
         mock_shell_out(0, "katie", ""))
-      @plugin.stub(:shell_out).with("hostname --fqdn").and_return(
+      allow(@plugin).to receive(:shell_out).with("hostname --fqdn").and_return(
         mock_shell_out(0, "katie.local", ""))
     end
 
     it "should be not be called twice" do
       @plugin.run
-      @plugin[:fqdn].should == "katie.local"
+      expect(@plugin[:fqdn]).to eq("katie.local")
     end
   end
 end

data/spec/unit/plugins/init_package_spec.rb

@@ -21,7 +21,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_he
 describe Ohai::System, "Init package" do
   let(:plugin) {
     p = get_plugin("init_package")
-    p.stub(:collect_os).and_return("linux")
+    allow(p).to receive(:collect_os).and_return("linux")
     p
   }
 
@@ -30,13 +30,13 @@ describe Ohai::System, "Init package" do
   let(:proc_1_file) { double(proc_1_file_path, :gets => proc1_content) }
 
   before(:each) do
-    File.stub(:exists?).with(proc_1_file_path).and_return(true)
-    File.stub(:open).with(proc_1_file_path).and_return(proc_1_file)
+    allow(File).to receive(:exists?).with(proc_1_file_path).and_return(true)
+    allow(File).to receive(:open).with(proc_1_file_path).and_return(proc_1_file)
   end
 
   it "should set init_package to init" do
     plugin.run
-    plugin[:init_package].should == "init"
+    expect(plugin[:init_package]).to eq("init")
   end
 
   describe "when init_package is systemd" do
@@ -44,7 +44,7 @@ describe Ohai::System, "Init package" do
 
     it "should set init_package to systemd" do
       plugin.run
-      plugin[:init_package].should == "systemd"
+      expect(plugin[:init_package]).to eq("systemd")
     end
   end
 end

data/spec/unit/plugins/ip_scopes_spec.rb

@@ -81,7 +81,7 @@ describe Ohai::System, "plugin ip_scopes" do
 
       before do
         # standin for raising on `require 'ipaddr_extensions'`
-        plugin[:network][:interfaces].stub(:keys).and_raise(LoadError)
+        allow(plugin[:network][:interfaces]).to receive(:keys).and_raise(LoadError)
         plugin.run
       end
 

data/spec/unit/plugins/java_spec.rb

@@ -28,44 +28,44 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
   shared_examples_for "when the JRE is installed" do
     before do
       @stderr = "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"
-      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      allow(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
     end
 
     it "should run java -mx64m -version" do
-      @plugin.should_receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      expect(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
       @plugin.run
     end
 
     it "should set java[:version]" do
       @plugin.run
-      @plugin[:languages][:java][:version].should eql("1.5.0_16")
+      expect(@plugin[:languages][:java][:version]).to eql("1.5.0_16")
     end
 
     it "should set java[:runtime][:name] to runtime name" do
       @plugin.run
-      @plugin[:languages][:java][:runtime][:name].should eql("Java(TM) 2 Runtime Environment, Standard Edition")
+      expect(@plugin[:languages][:java][:runtime][:name]).to eql("Java(TM) 2 Runtime Environment, Standard Edition")
     end
 
     it "should set java[:runtime][:build] to runtime build" do
       @plugin.run
-      @plugin[:languages][:java][:runtime][:build].should eql("1.5.0_16-b06-284")
+      expect(@plugin[:languages][:java][:runtime][:build]).to eql("1.5.0_16-b06-284")
     end
 
     it "should set java[:hotspot][:name] to hotspot name" do
       @plugin.run
-      @plugin[:languages][:java][:hotspot][:name].should eql("Java HotSpot(TM) Client VM")
+      expect(@plugin[:languages][:java][:hotspot][:name]).to eql("Java HotSpot(TM) Client VM")
     end
 
     it "should set java[:hotspot][:build] to hotspot build" do
       @plugin.run
-      @plugin[:languages][:java][:hotspot][:build].should eql("1.5.0_16-133, mixed mode, sharing")
+      expect(@plugin[:languages][:java][:hotspot][:build]).to eql("1.5.0_16-133, mixed mode, sharing")
     end
 
     it "should not set the languages[:java] tree up if java command fails" do
       @stderr = "Some error output here"
-      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(1, "", @stderr))
+      allow(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(1, "", @stderr))
       @plugin.run
-      @plugin[:languages].should_not have_key(:java)
+      expect(@plugin[:languages]).not_to have_key(:java)
     end
   end
 
@@ -73,44 +73,44 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
 
     before(:each) do
       @stderr = "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"
-      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      allow(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
     end
 
     it "should run java -mx64m -version" do
-      @plugin.should_receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      expect(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
       @plugin.run
     end
 
     it "should set java[:version]" do
       @plugin.run
-      @plugin[:languages][:java][:version].should eql("1.6.0_22")
+      expect(@plugin[:languages][:java][:version]).to eql("1.6.0_22")
     end
 
     it "should set java[:runtime][:name] to runtime name" do
       @plugin.run
-      @plugin[:languages][:java][:runtime][:name].should eql("Java(TM) 2 Runtime Environment")
+      expect(@plugin[:languages][:java][:runtime][:name]).to eql("Java(TM) 2 Runtime Environment")
     end
 
     it "should set java[:runtime][:build] to runtime build" do
       @plugin.run
-      @plugin[:languages][:java][:runtime][:build].should eql("1.6.0_22-b04")
+      expect(@plugin[:languages][:java][:runtime][:build]).to eql("1.6.0_22-b04")
     end
 
     it "should set java[:hotspot][:name] to hotspot name" do
       @plugin.run
-      @plugin[:languages][:java][:hotspot][:name].should eql("Java HotSpot(TM) Server VM")
+      expect(@plugin[:languages][:java][:hotspot][:name]).to eql("Java HotSpot(TM) Server VM")
     end
 
     it "should set java[:hotspot][:build] to hotspot build" do
       @plugin.run
-      @plugin[:languages][:java][:hotspot][:build].should eql("17.1-b03, mixed mode")
+      expect(@plugin[:languages][:java][:hotspot][:build]).to eql("17.1-b03, mixed mode")
     end
 
     it "should not set the languages[:java] tree up if java command fails" do
       @stderr = "Some error output here"
-      @plugin.stub(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
+      allow(@plugin).to receive(:shell_out).with("java -mx64m -version").and_return(mock_shell_out(0, "", @stderr))
       @plugin.run
-      @plugin[:languages].should_not have_key(:java)
+      expect(@plugin[:languages]).not_to have_key(:java)
     end
   end
 
@@ -133,14 +133,14 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
     end
 
     it "detects that it is on a darwin platform" do
-      @plugin.should be_on_darwin
+      expect(@plugin).to be_on_darwin
     end
 
     context "and real Java is installed" do
       before do
         java_home_status = double(Process::Status, :success? => true)
         java_home_cmd = double(Mixlib::ShellOut, :status => java_home_status)
-        @plugin.should_receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
+        expect(@plugin).to receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
       end
 
       context "and the client JRE is installed" do
@@ -155,13 +155,13 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
       before do
         java_home_status = double(Process::Status, :success? => false)
         java_home_cmd = double(Mixlib::ShellOut, :status => java_home_status)
-        @plugin.should_receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
+        expect(@plugin).to receive(:shell_out).with("/usr/libexec/java_home").and_return(java_home_cmd)
       end
 
       it "does not attempt to get java info" do
-        @plugin.should_not_receive(:shell_out).with("java -mx64m -version")
+        expect(@plugin).not_to receive(:shell_out).with("java -mx64m -version")
         @plugin.run
-        @plugin[:languages].should_not have_key(:java)
+        expect(@plugin[:languages]).not_to have_key(:java)
       end
     end
   end

data/spec/unit/plugins/joyent_spec.rb

@@ -8,25 +8,25 @@ describe Ohai::System, "plugin joyent" do
 
   describe "without joyent" do
     before(:each) do
-      @plugin.stub(:is_smartos?).and_return(false)
+      allow(@plugin).to receive(:is_smartos?).and_return(false)
     end
 
     it "should NOT create joyent" do
       @plugin.run
-      @plugin[:joyent].should be_nil
+      expect(@plugin[:joyent]).to be_nil
     end
   end
 
   describe "with joyent" do
     before(:each) do
-      @plugin.stub(:is_smartos?).and_return(true)
+      allow(@plugin).to receive(:is_smartos?).and_return(true)
       @plugin[:virtualization] = Mash.new
       @plugin[:virtualization][:guest_uuid] = "global"
     end
 
     it "should create joyent" do
       @plugin.run
-      @plugin[:joyent].should_not be_nil
+      expect(@plugin[:joyent]).not_to be_nil
     end
 
     describe "under global zone" do
@@ -35,11 +35,11 @@ describe Ohai::System, "plugin joyent" do
       end
 
       it "should ditect global zone" do
-        @plugin[:joyent][:sm_uuid].should eql 'global'
+        expect(@plugin[:joyent][:sm_uuid]).to eql 'global'
       end
 
       it "should NOT create sm_id" do
-        @plugin[:joyent][:sm_id].should be_nil
+        expect(@plugin[:joyent][:sm_id]).to be_nil
       end
     end
 
@@ -47,26 +47,26 @@ describe Ohai::System, "plugin joyent" do
       before(:each) do
         @plugin[:virtualization][:guest_uuid] = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx'
         @plugin[:virtualization][:guest_id] = '30'
-        @plugin.stub(:collect_product_file).and_return(["Name: Joyent Instance", "Image: base64 13.4.2", "Documentation: http://wiki.joyent.com/jpc2/SmartMachine+Base"])
-        @plugin.stub(:collect_pkgsrc).and_return('http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All')
+        allow(@plugin).to receive(:collect_product_file).and_return(["Name: Joyent Instance", "Image: base64 13.4.2", "Documentation: http://wiki.joyent.com/jpc2/SmartMachine+Base"])
+        allow(@plugin).to receive(:collect_pkgsrc).and_return('http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All')
         @plugin.run
       end
 
       it "should retrive zone uuid" do
-        @plugin[:joyent][:sm_uuid].should eql 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx'
+        expect(@plugin[:joyent][:sm_uuid]).to eql 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx'
       end
 
       it "should collect sm_id" do
-        @plugin[:joyent][:sm_id].should eql '30'
+        expect(@plugin[:joyent][:sm_id]).to eql '30'
       end
 
       it "should collect images" do
-        @plugin[:joyent][:sm_image_id].should_not be_nil
-        @plugin[:joyent][:sm_image_ver].should_not be_nil
+        expect(@plugin[:joyent][:sm_image_id]).not_to be_nil
+        expect(@plugin[:joyent][:sm_image_ver]).not_to be_nil
       end
 
       it "should collect pkgsrc" do
-        @plugin[:joyent][:sm_pkgsrc].should eql 'http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All'
+        expect(@plugin[:joyent][:sm_pkgsrc]).to eql 'http://pkgsrc.joyent.com/packages/SmartOS/2013Q4/x86_64/All'
       end
     end
   end

data/spec/unit/plugins/kernel_spec.rb

@@ -22,12 +22,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 describe Ohai::System, "plugin kernel" do
   before(:each) do
     @plugin = get_plugin("kernel")
-    @plugin.stub(:collect_os).and_return(:default) # for debugging
-    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "Darwin\n", ""))
-    @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "9.5.0\n", ""))
-    @plugin.stub(:shell_out).with("uname -v").and_return(mock_shell_out(0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""))
-    @plugin.stub(:shell_out).with("uname -m").and_return(mock_shell_out(0, "i386\n", ""))
-    @plugin.stub(:shell_out).with("uname -o").and_return(mock_shell_out(0, "Linux\n", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:default) # for debugging
+    allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "Darwin\n", ""))
+    allow(@plugin).to receive(:shell_out).with("uname -r").and_return(mock_shell_out(0, "9.5.0\n", ""))
+    allow(@plugin).to receive(:shell_out).with("uname -v").and_return(mock_shell_out(0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""))
+    allow(@plugin).to receive(:shell_out).with("uname -m").and_return(mock_shell_out(0, "i386\n", ""))
+    allow(@plugin).to receive(:shell_out).with("uname -o").and_return(mock_shell_out(0, "Linux\n", ""))
   end
 
   it_should_check_from_mash("kernel", "name", "uname -s", [0, "Darwin\n", ""])
@@ -53,15 +53,15 @@ describe Ohai::System, "plugin kernel" do
       os =  double( "WIN32OLE",
                     :properties_ => os_properties)
 
-      os.stub(:invoke).with(build_number.name).and_return('7601')
-      os.stub(:invoke).with(csd_version.name).and_return('Service Pack 1')
-      os.stub(:invoke).with(os_type.name).and_return(18)
-      os.stub(:invoke).with(caption.name).and_return('Microsoft Windows 7 Ultimate')
-      os.stub(:invoke).with(version.name).and_return('6.1.7601')
+      allow(os).to receive(:invoke).with(build_number.name).and_return('7601')
+      allow(os).to receive(:invoke).with(csd_version.name).and_return('Service Pack 1')
+      allow(os).to receive(:invoke).with(os_type.name).and_return(18)
+      allow(os).to receive(:invoke).with(caption.name).and_return('Microsoft Windows 7 Ultimate')
+      allow(os).to receive(:invoke).with(version.name).and_return('6.1.7601')
 
       os_wmi = WmiLite::Wmi::Instance.new(os)
 
-      WmiLite::Wmi.any_instance.should_receive(:first_of).with('Win32_OperatingSystem').and_return(os_wmi)
+      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with('Win32_OperatingSystem').and_return(os_wmi)
 
       # Mock a Win32_ComputerSystem OLE32 WMI object
       x64_system_type = 'x64-based PC'
@@ -69,21 +69,21 @@ describe Ohai::System, "plugin kernel" do
       cs = double("WIN32OLE",
                   :properties_ => [ double("WIN32OLE", :name => "SystemType") ])
 
-      cs.stub(:invoke).with('SystemType').and_return(x64_system_type)
+      allow(cs).to receive(:invoke).with('SystemType').and_return(x64_system_type)
 
       cs_wmi = WmiLite::Wmi::Instance.new(cs)
 
-      WmiLite::Wmi.any_instance.should_receive(:first_of).with('Win32_ComputerSystem').and_return(cs_wmi)
-      WmiLite::Wmi.any_instance.should_receive(:instances_of).with('Win32_PnPSignedDriver').and_return([])
+      expect_any_instance_of(WmiLite::Wmi).to receive(:first_of).with('Win32_ComputerSystem').and_return(cs_wmi)
+      expect_any_instance_of(WmiLite::Wmi).to receive(:instances_of).with('Win32_PnPSignedDriver').and_return([])
 
       @plugin.run
     end
     it "should set the corrent system information" do
-      @ohai_system.data[:kernel][:name].should == "Microsoft Windows 7 Ultimate"
-      @ohai_system.data[:kernel][:release].should == "6.1.7601"
-      @ohai_system.data[:kernel][:version].should == "6.1.7601 Service Pack 1 Build 7601"
-      @ohai_system.data[:kernel][:os].should == "WINNT"
-      @ohai_system.data[:kernel][:machine].should == "x86_64"
+      expect(@ohai_system.data[:kernel][:name]).to eq("Microsoft Windows 7 Ultimate")
+      expect(@ohai_system.data[:kernel][:release]).to eq("6.1.7601")
+      expect(@ohai_system.data[:kernel][:version]).to eq("6.1.7601 Service Pack 1 Build 7601")
+      expect(@ohai_system.data[:kernel][:os]).to eq("WINNT")
+      expect(@ohai_system.data[:kernel][:machine]).to eq("x86_64")
     end
   end