ohai 7.6.0.rc.1 → 8.0.1

data/spec/unit/plugins/cloud_v2_spec.rb

@@ -47,27 +47,27 @@ describe "CloudAttrs object" do
     @cloud_attr_obj.public_hostname = "myhost.somewhere.com"
     @cloud_attr_obj.local_hostname = "my-localhost"
     @cloud_attr_obj.provider = "my_awesome_cloud"
-    @cloud_attr_obj.cloud_mash.should == cloud_node
+    expect(@cloud_attr_obj.cloud_mash).to eq(cloud_node)
   end
 
   it "throws exception with a bad ipv4 address" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    lambda {  @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.should raise_error
+    expect {  @cloud_attr_obj.add_ipv6_addr("somebogusstring", :public) }.to raise_error
   end
 
   it "throws exception with a bad ipv6 address" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    lambda {  @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public)  }.should raise_error
+    expect {  @cloud_attr_obj.add_ipv6_addr("FEED:B0B:DEAD:BEEF", :public)  }.to raise_error
   end
 
   it "throws exception with ipv6 address passed to ipv4" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    lambda {  @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.should raise_error
+    expect {  @cloud_attr_obj.add_ipv4_addr("3ffe:506:2::1", :public) }.to raise_error
   end
 
   it "throws exception with ipv4 address passed to ipv6" do
     @cloud_attr_obj = ::CloudAttrs.new()
-    lambda {  @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.should raise_error
+    expect {  @cloud_attr_obj.add_ipv6_addr("1.2.3.4", :public) }.to raise_error
   end
 
 
@@ -87,7 +87,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:azure] = nil
       @plugin[:gce] = nil
       @plugin.run
-      @plugin[:cloud_v2].should be_nil
+      expect(@plugin[:cloud_v2]).to be_nil
     end
   end
 
@@ -99,18 +99,18 @@ describe Ohai::System, "plugin cloud" do
     it "populates cloud public ip" do
       @plugin[:ec2]['public_ipv4'] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:ec2]['public_ipv4']
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq(@plugin[:ec2]['public_ipv4'])
     end
 
     it "populates cloud private ip" do
       @plugin[:ec2]['local_ipv4'] = "10.252.42.149"
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == @plugin[:ec2]['local_ipv4']
+      expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq(@plugin[:ec2]['local_ipv4'])
     end
 
     it "populates cloud provider" do
       @plugin.run
-      @plugin[:cloud_v2][:provider].should == "ec2"
+      expect(@plugin[:cloud_v2][:provider]).to eq("ec2")
     end
   end
 
@@ -129,17 +129,17 @@ describe Ohai::System, "plugin cloud" do
 
     it "populates cloud public ip" do
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == "8.35.198.173"
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq("8.35.198.173")
     end
 
     it "populates cloud private ip" do
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == "10.240.0.102"
+      expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq("10.240.0.102")
     end
 
     it "populates cloud provider" do
       @plugin.run
-      @plugin[:cloud_v2][:provider].should == "gce"
+      expect(@plugin[:cloud_v2][:provider]).to eq("gce")
     end
   end
 
@@ -151,42 +151,42 @@ describe Ohai::System, "plugin cloud" do
     it "populates cloud public ip" do
       @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4].should == @plugin[:rackspace][:public_ipv4]
+      expect(@plugin[:cloud_v2][:public_ipv4]).to eq(@plugin[:rackspace][:public_ipv4])
     end
 
     it "populates cloud public ipv6" do
       @plugin[:rackspace][:public_ipv6] = "2a00:1a48:7805:111:e875:efaf:ff08:75"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv6].should == @plugin[:rackspace][:public_ipv6]
+      expect(@plugin[:cloud_v2][:public_ipv6]).to eq(@plugin[:rackspace][:public_ipv6])
     end
 
     it "populates cloud private ip" do
       @plugin[:rackspace][:local_ipv4] = "10.252.42.149"
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv4].should == @plugin[:rackspace][:local_ipv4]
+      expect(@plugin[:cloud_v2][:local_ipv4]).to eq(@plugin[:rackspace][:local_ipv4])
     end
 
     it "populates cloud private ipv6" do
       @plugin[:rackspace][:local_ipv6] = "2a00:1a48:7805:111:e875:efaf:ff08:75"
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv6].should == @plugin[:rackspace][:local_ipv6]
+      expect(@plugin[:cloud_v2][:local_ipv6]).to eq(@plugin[:rackspace][:local_ipv6])
     end
 
     it "populates first cloud public ip" do
       @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs].first.should == @plugin[:rackspace][:public_ipv4]
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs].first).to eq(@plugin[:rackspace][:public_ipv4])
     end
 
     it "populates first cloud public ip" do
       @plugin[:rackspace][:local_ipv4] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv4_addrs].first.should == @plugin[:rackspace][:local_ipv4]
+      expect(@plugin[:cloud_v2][:local_ipv4_addrs].first).to eq(@plugin[:rackspace][:local_ipv4])
     end
 
     it "populates cloud provider" do
       @plugin.run
-      @plugin[:cloud_v2][:provider].should == "rackspace"
+      expect(@plugin[:cloud_v2][:provider]).to eq("rackspace")
     end
   end
 
@@ -198,24 +198,24 @@ describe Ohai::System, "plugin cloud" do
     it "populates cloud public ip" do
       @plugin[:linode]['public_ip'] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:linode][:public_ip]
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq(@plugin[:linode][:public_ip])
     end
 
     it "populates cloud private ip" do
       @plugin[:linode]['private_ip'] = "10.252.42.149"
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == @plugin[:linode][:private_ip]
+      expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq(@plugin[:linode][:private_ip])
     end
 
     it "populates first cloud public ip" do
       @plugin[:linode]['public_ip'] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs].first.should == @plugin[:linode][:public_ip]
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs].first).to eq(@plugin[:linode][:public_ip])
     end
 
     it "populates cloud provider" do
       @plugin.run
-      @plugin[:cloud_v2][:provider].should == "linode"
+      expect(@plugin[:cloud_v2][:provider]).to eq("linode")
     end
   end
 
@@ -227,18 +227,18 @@ describe Ohai::System, "plugin cloud" do
     it "populates cloud public ip" do
       @plugin[:eucalyptus]['public_ipv4'] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:eucalyptus]['public_ipv4']
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq(@plugin[:eucalyptus]['public_ipv4'])
     end
 
     it "populates cloud private ip" do
       @plugin[:eucalyptus]['local_ipv4'] = "10.252.42.149"
       @plugin.run
-      @plugin[:cloud_v2][:local_ipv4_addrs][0].should == @plugin[:eucalyptus]['local_ipv4']
+      expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq(@plugin[:eucalyptus]['local_ipv4'])
     end
 
     it "populates cloud provider" do
       @plugin.run
-      @plugin[:cloud_v2][:provider].should == "eucalyptus"
+      expect(@plugin[:cloud_v2][:provider]).to eq("eucalyptus")
     end
   end
 
@@ -250,42 +250,42 @@ describe Ohai::System, "plugin cloud" do
     it "populates cloud public ip" do
       @plugin[:azure]['public_ip'] = "174.129.150.8"
       @plugin.run
-      @plugin[:cloud_v2][:public_ipv4_addrs][0].should == @plugin[:azure]['public_ip']
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq(@plugin[:azure]['public_ip'])
     end
 
     it "doesn't populates cloud vm_name" do
       @plugin[:azure]['vm_name'] = "linux-vm"
       @plugin.run
-      @plugin[:cloud_v2][:vm_name].should_not == @plugin[:azure]['vm_name']
+      expect(@plugin[:cloud_v2][:vm_name]).not_to eq(@plugin[:azure]['vm_name'])
     end
 
     it "populates cloud public_hostname" do
       @plugin[:azure]['public_fqdn'] = "linux-vm-svc.cloudapp.net"
       @plugin.run
-      @plugin[:cloud_v2][:public_hostname].should == @plugin[:azure]['public_fqdn']
+      expect(@plugin[:cloud_v2][:public_hostname]).to eq(@plugin[:azure]['public_fqdn'])
     end
 
     it "doesn't populate cloud public_ssh_port" do
       @plugin[:azure]['public_ssh_port'] = "22"
       @plugin.run
-      @plugin[:cloud_v2][:public_ssh_port].should be_nil
+      expect(@plugin[:cloud_v2][:public_ssh_port]).to be_nil
     end
 
     it "should not populate cloud public_ssh_port when winrm is used" do
       @plugin[:azure]['public_winrm_port'] = "5985"
       @plugin.run
-      @plugin[:cloud_v2][:public_ssh_port].should be_nil
+      expect(@plugin[:cloud_v2][:public_ssh_port]).to be_nil
     end
 
     it "populates cloud public_winrm_port" do
       @plugin[:azure]['public_winrm_port'] = "5985"
       @plugin.run
-      @plugin[:cloud_v2][:public_winrm_port].should be_nil
+      expect(@plugin[:cloud_v2][:public_winrm_port]).to be_nil
     end
 
     it "populates cloud provider" do
       @plugin.run
-      @plugin[:cloud_v2][:provider].should == "azure"
+      expect(@plugin[:cloud_v2][:provider]).to eq("azure")
     end
   end
 

data/spec/unit/plugins/cloudstack_spec.rb

@@ -28,7 +28,7 @@ describe "Cloudstack Plugin" do
 
   let(:cloudstack_plugin) do
     plugin = get_plugin("cloudstack", ohai_system)
-    plugin.stub(:hint?).with("cloudstack").and_return(cloudstack_hint)
+    allow(plugin).to receive(:hint?).with("cloudstack").and_return(cloudstack_hint)
     plugin
   end
 
@@ -51,7 +51,7 @@ describe "Cloudstack Plugin" do
     context "and the metadata service is not available" do
 
       before do
-        cloudstack_plugin.should_receive(:can_metadata_connect?).
+        expect(cloudstack_plugin).to receive(:can_metadata_connect?).
           with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR,80).
           and_return(false)
       end
@@ -97,21 +97,21 @@ EOM
       let(:http_client) { double("Net::HTTP", :read_timeout= => nil) }
 
       def expect_get(url, response_body)
-        http_client.should_receive(:get).
+        expect(http_client).to receive(:get).
           with(url).
           and_return(double("HTTP Response", :code => "200", :body => response_body))
       end
 
       before do
-        cloudstack_plugin.should_receive(:can_metadata_connect?).
+        expect(cloudstack_plugin).to receive(:can_metadata_connect?).
           with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR,80).
           and_return(true)
 
-        Net::HTTP.stub(:start).
+        allow(Net::HTTP).to receive(:start).
           with(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR).
           and_return(http_client)
 
-        cloudstack_plugin.stub(:best_api_version).and_return(metadata_version)
+        allow(cloudstack_plugin).to receive(:best_api_version).and_return(metadata_version)
 
         expect_get("/#{metadata_version}/meta-data/", metadata_root)
 

data/spec/unit/plugins/darwin/cpu_spec.rb

@@ -22,52 +22,52 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Darwin cpu plugin" do
   before(:each) do
     @plugin = get_plugin("darwin/cpu")
-    @plugin.stub(:collect_os).and_return(:darwin)
-    @plugin.stub(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", ""))
-    @plugin.stub(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", ""))
-    @plugin.stub(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.vendor").and_return(mock_shell_out(0, "GenuineIntel\n", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.brand_string").and_return(mock_shell_out(0, "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz\n", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.model").and_return(mock_shell_out(0, "58", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.family").and_return(mock_shell_out(0, "6", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.stepping").and_return(mock_shell_out(0, "9", ""))
-    @plugin.stub(:shell_out).with("sysctl -n machdep.cpu.features").and_return(mock_shell_out(0, "FPU VME DE PSE TSC MSR PAE MCE CX8 APIC SEP MTRR PGE MCA CMOV PAT PSE36 CLFSH DS ACPI MMX FXSR SSE SSE2 SS HTT TM PBE SSE3 PCLMULQDQ DTES64 MON DSCPL VMX EST TM2 SSSE3 CX16 TPR PDCM SSE4.1 SSE4.2 x2APIC POPCNT AES PCID XSAVE OSXSAVE TSCTMR AVX1.0 RDRAND F16C", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:darwin)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.physicalcpu").and_return(mock_shell_out(0, "4", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.logicalcpu").and_return(mock_shell_out(0, "8", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.cpufrequency").and_return(mock_shell_out(0, "2300000000", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.vendor").and_return(mock_shell_out(0, "GenuineIntel\n", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.brand_string").and_return(mock_shell_out(0, "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz\n", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.model").and_return(mock_shell_out(0, "58", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.family").and_return(mock_shell_out(0, "6", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.stepping").and_return(mock_shell_out(0, "9", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n machdep.cpu.features").and_return(mock_shell_out(0, "FPU VME DE PSE TSC MSR PAE MCE CX8 APIC SEP MTRR PGE MCA CMOV PAT PSE36 CLFSH DS ACPI MMX FXSR SSE SSE2 SS HTT TM PBE SSE3 PCLMULQDQ DTES64 MON DSCPL VMX EST TM2 SSSE3 CX16 TPR PDCM SSE4.1 SSE4.2 x2APIC POPCNT AES PCID XSAVE OSXSAVE TSCTMR AVX1.0 RDRAND F16C", ""))
     @plugin.run
   end
 
   it "should set cpu[:total] to 8" do
-    @plugin[:cpu][:total].should == 8
+    expect(@plugin[:cpu][:total]).to eq(8)
   end
 
   it "should set cpu[:real] to 4" do
-    @plugin[:cpu][:real].should == 4
+    expect(@plugin[:cpu][:real]).to eq(4)
   end
 
   it "should set cpu[:mhz] to 2300" do
-    @plugin[:cpu][:mhz].should == 2300
+    expect(@plugin[:cpu][:mhz]).to eq(2300)
   end
 
   it "should set cpu[:vendor_id] to GenuineIntel" do
-    @plugin[:cpu][:vendor_id].should == "GenuineIntel"
+    expect(@plugin[:cpu][:vendor_id]).to eq("GenuineIntel")
   end
 
   it "should set cpu[:model_name] to Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz" do
-    @plugin[:cpu][:model_name].should == "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz"
+    expect(@plugin[:cpu][:model_name]).to eq("Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz")
   end
 
   it "should set cpu[:model] to 58" do
-    @plugin[:cpu][:model].should == 58
+    expect(@plugin[:cpu][:model]).to eq(58)
   end
 
   it "should set cpu[:family] to 6" do
-    @plugin[:cpu][:family].should == 6
+    expect(@plugin[:cpu][:family]).to eq(6)
   end
 
   it "should set cpu[:stepping] to 9" do
-    @plugin[:cpu][:stepping].should == 9
+    expect(@plugin[:cpu][:stepping]).to eq(9)
   end
 
   it "should set cpu[:flags] to array of flags" do
-    @plugin[:cpu][:flags].should == ["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clfsh", "ds", "acpi", "mmx", "fxsr", "sse", "sse2", "ss", "htt", "tm", "pbe", "sse3", "pclmulqdq", "dtes64", "mon", "dscpl", "vmx", "est", "tm2", "ssse3", "cx16", "tpr", "pdcm", "sse4.1", "sse4.2", "x2apic", "popcnt", "aes", "pcid", "xsave", "osxsave", "tsctmr", "avx1.0", "rdrand", "f16c"]
+    expect(@plugin[:cpu][:flags]).to eq(["fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "clfsh", "ds", "acpi", "mmx", "fxsr", "sse", "sse2", "ss", "htt", "tm", "pbe", "sse3", "pclmulqdq", "dtes64", "mon", "dscpl", "vmx", "est", "tm2", "ssse3", "cx16", "tpr", "pdcm", "sse4.1", "sse4.2", "x2apic", "popcnt", "aes", "pcid", "xsave", "osxsave", "tsctmr", "avx1.0", "rdrand", "f16c"])
   end
 end

data/spec/unit/plugins/darwin/hostname_spec.rb

@@ -22,10 +22,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Darwin hostname plugin" do
   before(:each) do
     @plugin = get_plugin("hostname")
-    @plugin.stub(:collect_os).and_return(:darwin)
-    @plugin.stub(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))
-    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
-    @plugin.stub(:resolve_fqdn).and_return("katie.bethell")
+    allow(@plugin).to receive(:collect_os).and_return(:darwin)
+    allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))
+    allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
+    allow(@plugin).to receive(:resolve_fqdn).and_return("katie.bethell")
   end
 
   it_should_check_from("darwin::hostname", "hostname", "hostname -s", "katie")
@@ -34,12 +34,12 @@ describe Ohai::System, "Darwin hostname plugin" do
 
   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
 end
 

data/spec/unit/plugins/darwin/kernel_spec.rb

@@ -22,13 +22,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "Darwin kernel plugin" do
   before(:each) do
     @plugin = get_plugin("kernel")
-    @plugin.stub(:collect_os).and_return(:darwin)
-    @plugin.stub(:init_kernel).and_return({})
+    allow(@plugin).to receive(:collect_os).and_return(:darwin)
+    allow(@plugin).to receive(:init_kernel).and_return({})
   end
 
   it "should populate kernel[:modules] from `kextstat -k -l`" do
-    @plugin.stub(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "0", ""))
-    @plugin.stub(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, <<EOF, ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "0", ""))
+    allow(@plugin).to receive(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, <<EOF, ""))
     8    0 0xffffff7f81aed000 0x41000    0x41000    com.apple.kec.corecrypto (1.0) <7 6 5 4 3 1>
     9   22 0xffffff7f807f3000 0x9000     0x9000     com.apple.iokit.IOACPIFamily (1.4) <7 6 4 3>
    10   30 0xffffff7f80875000 0x29000    0x29000    com.apple.iokit.IOPCIFamily (2.8) <7 6 5 4 3>
@@ -43,27 +43,27 @@ EOF
       {"version"=>"2.8", "size"=>167936, "index"=>"10", "refcount"=>"30"}}
 
     @plugin.run
-    @plugin[:kernel][:modules].should eql(modules)
+    expect(@plugin[:kernel][:modules]).to eql(modules)
   end
 
   it "should not set kernel_machine to x86_64" do
-    @plugin.stub(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "0", ""))
-    @plugin.stub(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "0", ""))
+    allow(@plugin).to receive(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, "", ""))
     @plugin.run
-    @plugin[:kernel][:machine].should_not == 'x86_64'
+    expect(@plugin[:kernel][:machine]).not_to eq('x86_64')
   end
 
   it "should set kernel_machine to x86_64" do
-    @plugin.stub(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "1", ""))
-    @plugin.stub(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "1", ""))
+    allow(@plugin).to receive(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, "", ""))
     @plugin.run
-    @plugin[:kernel][:machine].should == 'x86_64'
+    expect(@plugin[:kernel][:machine]).to eq('x86_64')
   end
 
   it "should set the kernel_os to the kernel_name value" do
-    @plugin.stub(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "1", ""))
-    @plugin.stub(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.optional.x86_64").and_return(mock_shell_out(0, "1", ""))
+    allow(@plugin).to receive(:shell_out).with("kextstat -k -l").and_return(mock_shell_out(0, "", ""))
     @plugin.run
-    @plugin[:kernel][:os].should == @plugin[:kernel][:name]
+    expect(@plugin[:kernel][:os]).to eq(@plugin[:kernel][:name])
   end
 end

data/spec/unit/plugins/darwin/memory_spec.rb

@@ -40,25 +40,25 @@ Object cache: 12 hits of 139872 lookups (0% hit rate)
     DARWIN_VM_STAT
 
     @plugin = get_plugin("darwin/memory")
-    @plugin.stub(:collect_os).and_return(:darwin)
-    @plugin.stub(:shell_out).with("sysctl -n hw.memsize").and_return(mock_shell_out(0, darwin_memsize, ""))
-    @plugin.stub(:shell_out).with("vm_stat").and_return(mock_shell_out(0, darwin_vm_stat, ""))
+    allow(@plugin).to receive(:collect_os).and_return(:darwin)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.memsize").and_return(mock_shell_out(0, darwin_memsize, ""))
+    allow(@plugin).to receive(:shell_out).with("vm_stat").and_return(mock_shell_out(0, darwin_vm_stat, ""))
     @plugin.run
   end
 
   it "should set memory[:total] to 16384MB" do
-    @plugin[:memory][:total].should == '16384MB'
+    expect(@plugin[:memory][:total]).to eq('16384MB')
   end
 
   it "should set memory[:active] to 5140MB" do
-    @plugin[:memory][:active].should == '5140MB'
+    expect(@plugin[:memory][:active]).to eq('5140MB')
   end
 
   it "should set memory[:inactive] to 738MB" do
-    @plugin[:memory][:inactive].should == '738MB'
+    expect(@plugin[:memory][:inactive]).to eq('738MB')
   end
 
   it "should set memory[:free] to 10504MB" do
-    @plugin[:memory][:free].should == '10504MB'
+    expect(@plugin[:memory][:free]).to eq('10504MB')
   end
 end