ohai 7.6.0.rc.1 → 8.0.1

data/spec/unit/plugins/eucalyptus_spec.rb

@@ -27,7 +27,7 @@ describe Ohai::System, "plugin eucalyptus" do
 
   shared_examples_for "!eucalyptus" do
     it "should NOT attempt to fetch the eucalyptus metadata" do
-      OpenURI.should_not_receive(:open)
+      expect(OpenURI).not_to receive(:open)
       @plugin.run
     end
   end
@@ -35,38 +35,38 @@ describe Ohai::System, "plugin eucalyptus" do
   shared_examples_for "eucalyptus" do
     before(:each) do
       @http_client = double("Net::HTTP client")
-      @plugin.stub(:http_client).and_return(@http_client)
+      allow(@plugin).to receive(:http_client).and_return(@http_client)
 
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/").twice.
         and_return(double("Net::HTTP Response", :body => "2012-01-12", :code => "200"))
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/").
         and_return(double("Net::HTTP Response", :body => "instance_type\nami_id\nsecurity-groups", :code => "200"))
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/instance_type").
         and_return(double("Net::HTTP Response", :body => "c1.medium", :code => "200"))
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/ami_id").
         and_return(double("Net::HTTP Response", :body => "ami-5d2dc934", :code => "200"))
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/2012-01-12/meta-data/security-groups").
         and_return(double("Net::HTTP Response", :body => "group1\ngroup2", :code => "200"))
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/2012-01-12/user-data/").
         and_return(double("Net::HTTP Response", :body => "By the pricking of my thumb...", :code => "200"))
     end
 
     it "should recursively fetch all the eucalyptus metadata" do
-      IO.stub(:select).and_return([[],[1],[]])
+      allow(IO).to receive(:select).and_return([[],[1],[]])
       t = double("connection")
-      t.stub(:connect_nonblock).and_raise(Errno::EINPROGRESS)
-      Socket.stub(:new).and_return(t)
+      allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
+      allow(Socket).to receive(:new).and_return(t)
       @plugin.run
-      @plugin[:eucalyptus].should_not be_nil
-      @plugin[:eucalyptus]['instance_type'].should == "c1.medium"
-      @plugin[:eucalyptus]['ami_id'].should == "ami-5d2dc934"
-      @plugin[:eucalyptus]['security_groups'].should eql ['group1', 'group2']
+      expect(@plugin[:eucalyptus]).not_to be_nil
+      expect(@plugin[:eucalyptus]['instance_type']).to eq("c1.medium")
+      expect(@plugin[:eucalyptus]['ami_id']).to eq("ami-5d2dc934")
+      expect(@plugin[:eucalyptus]['security_groups']).to eql ['group1', 'group2']
     end
   end
 
@@ -74,7 +74,7 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "eucalyptus"
 
     before(:each) do
-      IO.stub(:select).and_return([[],[1],[]])
+      allow(IO).to receive(:select).and_return([[],[1],[]])
       @plugin[:network] = { "interfaces" => { "eth0" => { "addresses" => { "d0:0d:95:47:6E:ED"=> { "family" => "lladdr" } } } } }
     end
   end
@@ -91,10 +91,10 @@ describe Ohai::System, "plugin eucalyptus" do
     it_should_behave_like "eucalyptus"
 
     before(:each) do
-      File.stub(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/eucalyptus.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/eucalyptus.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/eucalyptus.json').and_return('')
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(true)
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/eucalyptus.json').and_return('')
     end
   end
 
@@ -103,8 +103,8 @@ describe Ohai::System, "plugin eucalyptus" do
 
     before(:each) do
       @plugin[:network] = {:interfaces => {}}
-      File.stub(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
     end
   end
 
@@ -114,12 +114,12 @@ describe Ohai::System, "plugin eucalyptus" do
     before(:each) do
       @plugin[:network] = {:interfaces => {}}
 
-      File.stub(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
-      File.stub(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
-      File.stub(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/eucalyptus.json').and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/eucalyptus.json').and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/ec2.json').and_return(true)
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/ec2.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/ec2.json').and_return('')
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/ec2.json').and_return('')
     end
   end
 

data/spec/unit/plugins/fail_spec.rb

@@ -56,16 +56,16 @@ shared_examples "a v7 loading failure" do
   it "should not have attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
     #@ohai.attributes.should_not have_key("fail")
-    lambda { @ohai.provides_map.find_providers_for(["fail"]) }.should raise_error(Ohai::Exceptions::AttributeNotFound)
+    expect { @ohai.provides_map.find_providers_for(["fail"]) }.to raise_error(Ohai::Exceptions::AttributeNotFound)
   end
 
   it "should not have source key" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    @ohai.v6_dependency_solver.should_not have_key("#{tmp}/plugins/fail.rb")
+    expect(@ohai.v6_dependency_solver).not_to have_key("#{tmp}/plugins/fail.rb")
   end
 
   it "should write to Ohai::Log" do
-    Ohai::Log.should_receive(:warn).once
+    expect(Ohai::Log).to receive(:warn).once
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
   end
 end
@@ -104,16 +104,16 @@ shared_examples "a v7 loading success" do
 
   it "should have attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    @ohai.provides_map.should have_key("fail")
+    expect(@ohai.provides_map).to have_key("fail")
   end
 
   it "should have source key" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
-    @ohai.v6_dependency_solver.should have_key("#{tmp}/plugins/fail.rb")
+    expect(@ohai.v6_dependency_solver).to have_key("#{tmp}/plugins/fail.rb")
   end
 
   it "should not write to Ohai::Log" do
-    Ohai::Log.should_not_receive(:warn)
+    expect(Ohai::Log).not_to receive(:warn)
     @loader.load_plugin("#{tmp}/plugins/fail.rb")
   end
 end
@@ -152,11 +152,11 @@ shared_examples "a v7 run failure" do
 
   it "should not have new attribute keys" do
     @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
-    @ohai.provides_map.should_not have_key("other")
+    expect(@ohai.provides_map).not_to have_key("other")
   end
 
   it "should write to Ohai::Log" do
-    Ohai::Log.should_receive(:warn).once
+    expect(Ohai::Log).to receive(:warn).once
     @loader.load_plugin("#{tmp}/plugins/fail.rb").new(@ohai).run
   end
 end

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

@@ -21,10 +21,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "FreeBSD cpu plugin" do
   before(:each) do
     @plugin = get_plugin("freebsd/cpu")
-    @plugin.stub(:collect_os).and_return(:freebsd)
-    @plugin.stub(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.ncpu").and_return(mock_shell_out(0, "2", ""))
     @double_file = double("/var/run/dmesg.boot")
-    @double_file.stub(:each).
+    allow(@double_file).to receive(:each).
       and_yield('CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)').
       and_yield('  Origin = "GenuineIntel"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9').
       and_yield('  Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>').
@@ -32,37 +32,37 @@ describe Ohai::System, "FreeBSD cpu plugin" do
       and_yield('  AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>').
       and_yield('  AMD Features2=0x1<LAHF>').
       and_yield('  TSC: P-state invariant')
-    File.stub(:open).with("/var/run/dmesg.boot").and_return(@double_file)
+    allow(File).to receive(:open).with("/var/run/dmesg.boot").and_return(@double_file)
   end
 
   it "detects all CPU flags" do
     @plugin.run
-    @plugin[:cpu][:flags].should == %w{fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr sse sse2 sse3 mon ssse3 syscall nx rdtscp lm lahf}
+    expect(@plugin[:cpu][:flags]).to eq(%w{fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr sse sse2 sse3 mon ssse3 syscall nx rdtscp lm lahf})
   end
 
   it "detects all CPU model_name" do
     @plugin.run
-    @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 "detects all CPU mhz" do
     @plugin.run
-    @plugin[:cpu][:mhz].should == "3516.61"
+    expect(@plugin[:cpu][:mhz]).to eq("3516.61")
   end
 
   it "detects all CPU vendor_id" do
     @plugin.run
-    @plugin[:cpu][:vendor_id].should == "GenuineIntel"
+    expect(@plugin[:cpu][:vendor_id]).to eq("GenuineIntel")
   end
 
   it "detects all CPU stepping" do
     @plugin.run
-    @plugin[:cpu][:stepping].should == "9"
+    expect(@plugin[:cpu][:stepping]).to eq("9")
   end
 
   it "detects all CPU total" do
     @plugin.run
-    @plugin[:cpu][:total].should == 2
+    expect(@plugin[:cpu][:total]).to eq(2)
   end
 
 end

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

@@ -22,10 +22,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "FreeBSD hostname plugin" do
   before(:each) do
     @plugin = get_plugin("hostname")
-    @plugin.stub(:collect_os).and_return(:freebsd)
-    @plugin.stub(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))
-    @plugin.stub(:shell_out).with("hostname -f").and_return(mock_shell_out(0, "katie.bethell", ""))
-    @plugin.stub(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:shell_out).with("hostname -s").and_return(mock_shell_out(0, "katie", ""))
+    allow(@plugin).to receive(:shell_out).with("hostname -f").and_return(mock_shell_out(0, "katie.bethell", ""))
+    allow(@plugin).to receive(:shell_out).with("hostname").and_return(mock_shell_out(0, "katie.local", ""))
   end
 
   it_should_check_from("freebsd::hostname", "hostname", "hostname -s", "katie")

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

@@ -22,16 +22,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "FreeBSD kernel plugin" do
   before(:each) do
     @plugin = get_plugin("kernel")
-    @plugin.stub(:collect_os).and_return(:freebsd)
-    @plugin.stub(:init_kernel).and_return({:name => "freebsd"})
-    @plugin.stub(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo\n", ""))
-    @plugin.stub(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1", ""))
-    @plugin.stub(:shell_out).with( Ohai.abs_path( "/sbin/kldstat" )).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:init_kernel).and_return({:name => "freebsd"})
+    allow(@plugin).to receive(:shell_out).with("uname -i").and_return(mock_shell_out(0, "foo\n", ""))
+    allow(@plugin).to receive(:shell_out).with("sysctl kern.securelevel").and_return(mock_shell_out(0, "kern.securelevel: 1", ""))
+    allow(@plugin).to receive(:shell_out).with( Ohai.abs_path( "/sbin/kldstat" )).and_return(mock_shell_out(0, "  1    7 0xc0400000 97f830   kernel", ""))
   end
 
   it "should set the kernel_os to the kernel_name value" do
     @plugin.run
-    @plugin[:kernel][:os].should == @plugin[:kernel][:name]
+    expect(@plugin[:kernel][:os]).to eq(@plugin[:kernel][:name])
   end
 
 end

data/spec/unit/plugins/freebsd/os_spec.rb

@@ -22,12 +22,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "FreeBSD plugin os" do
   before(:each) do
     @plugin = get_plugin("freebsd/os")
-    @plugin.stub(:shell_out).with("sysctl -n kern.osreldate").and_return(mock_shell_out(0, "902001\n", ""))
-    @plugin.stub(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n kern.osreldate").and_return(mock_shell_out(0, "902001\n", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
   end
 
   it "should set os_version to __FreeBSD_version" do
     @plugin.run
-    @plugin[:os_version].should == "902001"
+    expect(@plugin[:os_version]).to eq("902001")
   end
 end  

data/spec/unit/plugins/freebsd/platform_spec.rb

@@ -22,18 +22,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "FreeBSD plugin platform" do
   before(:each) do
     @plugin = get_plugin("freebsd/platform")
-    @plugin.stub(:shell_out).with("uname -s").and_return(mock_shell_out(0, "FreeBSD\n", ""))
-    @plugin.stub(:shell_out).with("uname -r").and_return(mock_shell_out(0, "7.1\n", ""))
-    @plugin.stub(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:shell_out).with("uname -s").and_return(mock_shell_out(0, "FreeBSD\n", ""))
+    allow(@plugin).to receive(:shell_out).with("uname -r").and_return(mock_shell_out(0, "7.1\n", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
   end
 
   it "should set platform to lowercased lsb[:id]" do
     @plugin.run        
-    @plugin[:platform].should == "freebsd"
+    expect(@plugin[:platform]).to eq("freebsd")
   end
   
   it "should set platform_version to lsb[:release]" do
     @plugin.run
-    @plugin[:platform_version].should == "7.1"
+    expect(@plugin[:platform_version]).to eq("7.1")
   end
 end  

data/spec/unit/plugins/freebsd/virtualization_spec.rb

@@ -21,28 +21,28 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 describe Ohai::System, "FreeBSD virtualization plugin" do
   before(:each) do
     @plugin = get_plugin("freebsd/virtualization")
-    @plugin.stub(:collect_os).and_return(:freebsd)
-    @plugin.stub(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
-    @plugin.stub(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, "", ""))
-    @plugin.stub(:shell_out).with("jls -n").and_return(mock_shell_out(0, "",""))
-    @plugin.stub(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:collect_os).and_return(:freebsd)
+    allow(@plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "0", ""))
+    allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path( "/sbin/kldstat" )}").and_return(mock_shell_out(0, "", ""))
+    allow(@plugin).to receive(:shell_out).with("jls -n").and_return(mock_shell_out(0, "",""))
+    allow(@plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, "", ""))
   end
 
   context "jails" do
     it "detects we are in a jail" do
-      @plugin.stub(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "1", ""))
+      allow(@plugin).to receive(:shell_out).with("sysctl -n security.jail.jailed").and_return(mock_shell_out(0, "1", ""))
       @plugin.run
-      @plugin[:virtualization][:system].should == "jail"
-      @plugin[:virtualization][:role].should == "guest"
+      expect(@plugin[:virtualization][:system]).to eq("jail")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
     end
 
     it "detects we are hosting jails" do
       # from http://www.freebsd.org/doc/handbook/jails-application.html
     @jails = "JID  IP Address      Hostname                      Path\n     3  192.168.3.17    ns.example.org                /home/j/ns\n     2  192.168.3.18    mail.example.org              /home/j/mail\n     1  62.123.43.14    www.example.org               /home/j/www"
-      @plugin.stub(:shell_out).with("jls -n").and_return(mock_shell_out(0, @jails, ""))
+      allow(@plugin).to receive(:shell_out).with("jls -n").and_return(mock_shell_out(0, @jails, ""))
       @plugin.run
-      @plugin[:virtualization][:system].should == "jail"
-      @plugin[:virtualization][:role].should == "host"
+      expect(@plugin[:virtualization][:system]).to eq("jail")
+      expect(@plugin[:virtualization][:role]).to eq("host")
     end
   end
 
@@ -53,13 +53,13 @@ Id Refs Address Size Name
 1 40 0xffffffff80100000 d20428 kernel
 7 3 0xffffffff81055000 41e88 vboxguest.ko
 OUT
-      @plugin.stub(:shell_out).with("#{ Ohai.abs_path("/sbin/kldstat")}").and_return(mock_shell_out(0, @vbox_guest, ""))
+      allow(@plugin).to receive(:shell_out).with("#{ Ohai.abs_path("/sbin/kldstat")}").and_return(mock_shell_out(0, @vbox_guest, ""))
     end
 
     it "detects we are a guest" do
       @plugin.run
-      @plugin[:virtualization][:system].should == "vbox"
-      @plugin[:virtualization][:role].should == "guest"
+      expect(@plugin[:virtualization][:system]).to eq("vbox")
+      expect(@plugin[:virtualization][:role]).to eq("guest")
     end
   end
 
@@ -70,23 +70,23 @@ Id Refs Address Size Name
 1 40 0xffffffff80100000 d20428 kernel
 7 3 0xffffffff81055000 41e88 vboxdrv.ko
 OUT
-      @plugin.stub(:shell_out).with("/sbin/kldstat").and_return(mock_shell_out(0, @stdout, ""))
+      allow(@plugin).to receive(:shell_out).with("/sbin/kldstat").and_return(mock_shell_out(0, @stdout, ""))
     end
 
     it "detects we are a host" do
       @plugin.run
-      @plugin[:virtualization][:system].should == "vbox"
-      @plugin[:virtualization][:role].should == "host"
+      expect(@plugin[:virtualization][:system]).to eq("vbox")
+      expect(@plugin[:virtualization][:role]).to eq("host")
     end
   end
 
   context "when on a QEMU guest" do
     it "detects we are a guest" do
       [ 'Common KVM processor', 'QEMU Virtual CPU version (cpu64-rhel6) ("GenuineIntel" 686-class)', 'Common 32-bit KVM processor'].each do |kvm_string|
-        @plugin.stub(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, kvm_string, ""))
+        allow(@plugin).to receive(:shell_out).with("sysctl -n hw.model").and_return(mock_shell_out(0, kvm_string, ""))
         @plugin.run
-        @plugin[:virtualization][:system].should == "kvm"
-        @plugin[:virtualization][:role].should == "guest"
+        expect(@plugin[:virtualization][:system]).to eq("kvm")
+        expect(@plugin[:virtualization][:role]).to eq("guest")
       end
     end
   end

data/spec/unit/plugins/gce_spec.rb

@@ -25,7 +25,7 @@ describe Ohai::System, "plugin gce" do
 
   shared_examples_for "!gce" do
     it "should NOT attempt to fetch the gce metadata" do
-      @plugin.should_not_receive(:http_client)
+      expect(@plugin).not_to receive(:http_client)
       @plugin.run
     end
   end
@@ -33,23 +33,23 @@ describe Ohai::System, "plugin gce" do
   shared_examples_for "gce" do
     before(:each) do
       @http_client = double("Net::HTTP client")
-      @plugin.stub(:http_client).and_return(@http_client)
-      IO.stub(:select).and_return([[],[1],[]])
+      allow(@plugin).to receive(:http_client).and_return(@http_client)
+      allow(IO).to receive(:select).and_return([[],[1],[]])
       t = double("connection")
-      t.stub(:connect_nonblock).and_raise(Errno::EINPROGRESS)
-      Socket.stub(:new).and_return(t)
-      Socket.stub(:pack_sockaddr_in).and_return(nil)
+      allow(t).to receive(:connect_nonblock).and_raise(Errno::EINPROGRESS)
+      allow(Socket).to receive(:new).and_return(t)
+      allow(Socket).to receive(:pack_sockaddr_in).and_return(nil)
     end
 
     it "should recursively fetch and properly parse json metadata" do
-      @http_client.should_receive(:get).
+      expect(@http_client).to receive(:get).
         with("/computeMetadata/v1beta1/?recursive=true/").
         and_return(double("Net::HTTP Response", :body => '{"instance":{"hostname":"test-host"}}', :code=>"200"))
 
       @plugin.run
 
-      @plugin[:gce].should_not be_nil
-      @plugin[:gce]['instance'].should eq("hostname"=>"test-host")
+      expect(@plugin[:gce]).not_to be_nil
+      expect(@plugin[:gce]['instance']).to eq("hostname"=>"test-host")
     end
 
   end
@@ -58,10 +58,10 @@ describe Ohai::System, "plugin gce" do
     it_should_behave_like "gce"
 
     before(:each) do
-      File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(true)
-      File.stub(:read).with('/etc/chef/ohai/hints/gce.json').and_return('')
-      File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(true)
-      File.stub(:read).with('C:\chef\ohai\hints/gce.json').and_return('')
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(true)
+      allow(File).to receive(:read).with('/etc/chef/ohai/hints/gce.json').and_return('')
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(true)
+      allow(File).to receive(:read).with('C:\chef\ohai\hints/gce.json').and_return('')
     end
   end
 
@@ -69,15 +69,15 @@ describe Ohai::System, "plugin gce" do
     it_should_behave_like "!gce"
 
     before(:each) do
-      File.stub(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
-      File.stub(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
+      allow(File).to receive(:exist?).with('/etc/chef/ohai/hints/gce.json').and_return(false)
+      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/gce.json').and_return(false)
 
       # Raise Errno::ENOENT to simulate the scenario in which metadata server
       # can not be connected
       t = double("connection")
-      t.stub(:connect_nonblock).and_raise(Errno::ENOENT)
-      Socket.stub(:new).and_return(t)
-      Socket.stub(:pack_sockaddr_in).and_return(nil)
+      allow(t).to receive(:connect_nonblock).and_raise(Errno::ENOENT)
+      allow(Socket).to receive(:new).and_return(t)
+      allow(Socket).to receive(:pack_sockaddr_in).and_return(nil)
     end
   end