puppet 5.5.22-x64-mingw32 → 6.0.0-x64-mingw32

data/spec/unit/util/metric_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/metric'

data/spec/unit/util/monkey_patches_spec.rb

@@ -1,7 +1,9 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/monkey_patches'
 
+
 describe Symbol do
   after :all do
     $unique_warnings.delete('symbol_comparison') if $unique_warnings
@@ -18,7 +20,6 @@ describe Symbol do
   end
 
   it "should have an == that is not true for a string with same letters" do
-    pending "JRuby is incompatible with MRI - Cannot test this on JRuby" if RUBY_PLATFORM == 'java'
     symbol = :undef
     expect(symbol == 'undef').to_not be(true)
   end
@@ -53,7 +54,7 @@ describe OpenSSL::SSL::SSLContext do
   end
 
   it 'sets parameters on initialization' do
-    expect_any_instance_of(described_class).to receive(:set_params)
+    described_class.any_instance.expects(:set_params)
     subject
   end
 
@@ -72,7 +73,7 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
   let(:samecert) { cert.dup() }
 
   def with_root_certs(certs)
-    expect(Puppet::Util::Windows::RootCerts).to receive(:instance).and_return(certs)
+    Puppet::Util::Windows::RootCerts.expects(:instance).returns(certs)
   end
 
   it "adds a root cert to the store" do
@@ -83,7 +84,7 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
 
   it "doesn't warn when calling set_default_paths multiple times" do
     with_root_certs([cert])
-    expect(store).not_to receive(:warn)
+    store.expects(:warn).never
 
     store.set_default_paths
     store.set_default_paths
@@ -94,32 +95,19 @@ describe OpenSSL::X509::Store, :if => Puppet::Util::Platform.windows? do
     expect(cert.hash).to_not eq(samecert.hash)
     with_root_certs([cert, samecert])
 
-    expect(store).to receive(:add_cert).with(cert).once
-    expect(store).not_to receive(:add_cert).with(samecert)
+    store.expects(:add_cert).with(cert).once
+    store.expects(:add_cert).with(samecert).never
 
     store.set_default_paths
   end
 
-  # openssl 1.1.1 ignores duplicate certs
-  # https://github.com/openssl/openssl/commit/c0452248ea1a59a41023a4765ef7d9825e80a62b
-  if OpenSSL::OPENSSL_VERSION_NUMBER < 0x10101000
-    it "warns when adding a certificate that already exists" do
-      with_root_certs([cert])
-      store.add_cert(cert)
-
-      expect(store).to receive(:warn).with('Failed to add /DC=com/DC=microsoft/CN=Microsoft Root Certificate Authority')
-
-      store.set_default_paths
-    end
-  else
-    it "doesn't warn when adding a duplicate cert" do
-      with_root_certs([cert])
-      store.add_cert(cert)
+  it "warns when adding a certificate that already exists" do
+    with_root_certs([cert])
+    store.add_cert(cert)
 
-      expect(store).not_to receive(:warn)
+    store.expects(:warn).with('Failed to add /DC=com/DC=microsoft/CN=Microsoft Root Certificate Authority')
 
-      store.set_default_paths
-    end
+    store.set_default_paths
   end
 
   it "raises when adding an invalid certificate" do

data/spec/unit/util/multi_match_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/multi_match'
 

data/spec/unit/util/network_device/config_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/network_device/config'

data/spec/unit/util/network_device/transport/base_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/network_device/transport/base'
@@ -12,28 +13,28 @@ describe Puppet::Util::NetworkDevice::Transport::Base do
 
   describe "when sending commands" do
     it "should send the command to the telnet session" do
-      expect(@transport).to receive(:send).with("line")
+      @transport.expects(:send).with("line")
       @transport.command("line")
     end
 
     it "should expect an output matching the given prompt" do
-      expect(@transport).to receive(:expect).with(/prompt/)
+      @transport.expects(:expect).with(/prompt/)
       @transport.command("line", :prompt => /prompt/)
     end
 
     it "should expect an output matching the default prompt" do
       @transport.default_prompt = /defprompt/
-      expect(@transport).to receive(:expect).with(/defprompt/)
+      @transport.expects(:expect).with(/defprompt/)
       @transport.command("line")
     end
 
     it "should yield telnet output to the given block" do
-      expect(@transport).to receive(:expect).and_yield("output")
+      @transport.expects(:expect).yields("output")
       @transport.command("line") { |out| expect(out).to eq("output") }
     end
 
     it "should return telnet output to the caller" do
-      expect(@transport).to receive(:expect).and_return("output")
+      @transport.expects(:expect).returns("output")
       expect(@transport.command("line")).to eq("output")
     end
   end

data/spec/unit/util/network_device_spec.rb

@@ -1,9 +1,11 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'ostruct'
 require 'puppet/util/network_device'
 
 describe Puppet::Util::NetworkDevice do
+
   before(:each) do
     @device = OpenStruct.new(:name => "name", :provider => "test", :url => "telnet://admin:password@127.0.0.1", :options => { :debug => false })
   end
@@ -21,25 +23,25 @@ describe Puppet::Util::NetworkDevice do
 
   describe "when initializing the remote network device singleton" do
     it "should load the network device code" do
-      expect(Puppet::Util::NetworkDevice).to receive(:require)
+      Puppet::Util::NetworkDevice.expects(:require)
       Puppet::Util::NetworkDevice.init(@device)
     end
 
     it "should create a network device instance" do
-      allow(Puppet::Util::NetworkDevice).to receive(:require)
-      expect(Puppet::Util::NetworkDevice::Test::Device).to receive(:new).with("telnet://admin:password@127.0.0.1", :debug => false)
+      Puppet::Util::NetworkDevice.stubs(:require)
+      Puppet::Util::NetworkDevice::Test::Device.expects(:new).with("telnet://admin:password@127.0.0.1", :debug => false)
       Puppet::Util::NetworkDevice.init(@device)
     end
 
     it "should raise an error if the remote device instance can't be created" do
-      allow(Puppet::Util::NetworkDevice).to receive(:require).and_raise("error")
+      Puppet::Util::NetworkDevice.stubs(:require).raises("error")
       expect { Puppet::Util::NetworkDevice.init(@device) }.to raise_error(RuntimeError, /Can't load test for name/)
     end
 
     it "should let caller to access the singleton device" do
-      device = double('device')
-      allow(Puppet::Util::NetworkDevice).to receive(:require)
-      expect(Puppet::Util::NetworkDevice::Test::Device).to receive(:new).and_return(device)
+      device = stub 'device'
+      Puppet::Util::NetworkDevice.stubs(:require)
+      Puppet::Util::NetworkDevice::Test::Device.expects(:new).returns(device)
       Puppet::Util::NetworkDevice.init(@device)
 
       expect(Puppet::Util::NetworkDevice.current).to eq(device)

data/spec/unit/util/package_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/package'

data/spec/unit/util/pidlock_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/pidlock'
@@ -50,7 +51,7 @@ describe Puppet::Util::Pidlock do
     end
 
     it 'should create an empty lock file even when pid is missing' do
-      allow(Process).to receive(:pid).and_return('')
+      Process.stubs(:pid).returns('')
       @lock.lock
       expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_truthy
       expect(Puppet::FileSystem.read(@lock.file_path)).to be_empty
@@ -58,12 +59,12 @@ describe Puppet::Util::Pidlock do
 
     it 'should replace an existing empty lockfile with a pid, given a subsequent lock call made against a valid pid' do
       # empty pid results in empty lockfile
-      allow(Process).to receive(:pid).and_return('')
+      Process.stubs(:pid).returns('')
       @lock.lock
       expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_truthy
 
       # next lock call with valid pid kills existing empty lockfile
-      allow(Process).to receive(:pid).and_return(1234)
+      Process.stubs(:pid).returns(1234)
       @lock.lock
       expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_truthy
       expect(Puppet::FileSystem.read(@lock.file_path)).to eq('1234')
@@ -104,7 +105,7 @@ describe Puppet::Util::Pidlock do
     end
 
     it "should remove the lockfile when pid is missing" do
-      allow(Process).to receive(:pid).and_return('')
+      Process.stubs(:pid).returns('')
       @lock.lock
       expect(@lock.locked?).to be_falsey
       expect(Puppet::FileSystem.exist?(@lock.file_path)).to be_falsey
@@ -114,7 +115,7 @@ describe Puppet::Util::Pidlock do
   describe '#lock_pid' do
     it 'should return nil if the pid is empty' do
       # fake pid to get empty lockfile
-      allow(Process).to receive(:pid).and_return('')
+      Process.stubs(:pid).returns('')
       @lock.lock
       expect(@lock.lock_pid).to eq(nil)
     end
@@ -123,15 +124,15 @@ describe Puppet::Util::Pidlock do
   describe "with a stale lock" do
     before(:each) do
       # fake our pid to be 1234
-      allow(Process).to receive(:pid).and_return(1234)
+      Process.stubs(:pid).returns(1234)
       # lock the file
       @lock.lock
       # fake our pid to be a different pid, to simulate someone else
       #  holding the lock
-      allow(Process).to receive(:pid).and_return(6789)
+      Process.stubs(:pid).returns(6789)
 
-      allow(Process).to receive(:kill).with(0, 6789)
-      allow(Process).to receive(:kill).with(0, 1234).and_raise(Errno::ESRCH)
+      Process.stubs(:kill).with(0, 6789)
+      Process.stubs(:kill).with(0, 1234).raises(Errno::ESRCH)
     end
 
     it "should not be locked" do
@@ -165,67 +166,18 @@ describe Puppet::Util::Pidlock do
     end
   end
 
-  describe "with no access to open the process on Windows", :if => Puppet.features.microsoft_windows? do
-    before(:each) do
-      allow(Process).to receive(:pid).and_return(6789)
-      @lock.lock
-      allow(Process).to receive(:pid).and_return(1234)
-      exception = Puppet::Util::Windows::Error.new('Access Denied', 5) # ERROR_ACCESS_DENIED
-      allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(6789).and_raise(exception)
-      allow(Process).to receive(:kill).with(0, 6789)
-      allow(Process).to receive(:kill).with(0, 1234)
-    end
-
-    it "should be locked" do
-      expect(@lock).to be_locked
-    end
-
-    describe "#lock" do
-      it "should not be possible" do
-        expect(@lock.lock).to be_falsey
-      end
-
-      it "should not overwrite the lock" do
-        @lock.lock
-        expect(@lock).not_to be_mine
-      end
-    end
-
-    describe "#unlock" do
-      it "should not be possible" do
-        expect(@lock.unlock).to be_falsey
-      end
-
-      it "should not remove the lock file" do
-        @lock.unlock
-        expect(Puppet::FileSystem.exist?(@lockfile)).to be_truthy
-      end
-
-      it "should still not be our lock" do
-        @lock.unlock
-        expect(@lock).not_to be_mine
-      end
-    end
-  end
-
   describe "with another process lock" do
     before(:each) do
       # fake our pid to be 1234
-      allow(Process).to receive(:pid).and_return(1234)
-      if Puppet::Util::Platform.windows?
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
-      else
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('puppet')
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('puppet')
-      end
+      Process.stubs(:pid).returns(1234)
       # lock the file
       @lock.lock
       # fake our pid to be a different pid, to simulate someone else
       #  holding the lock
-      allow(Process).to receive(:pid).and_return(6789)
+      Process.stubs(:pid).returns(6789)
 
-      allow(Process).to receive(:kill).with(0, 6789)
-      allow(Process).to receive(:kill).with(0, 1234)
+      Process.stubs(:kill).with(0, 6789)
+      Process.stubs(:kill).with(0, 1234)
     end
 
     it "should be locked" do
@@ -236,30 +188,6 @@ describe Puppet::Util::Pidlock do
       expect(@lock).not_to be_mine
     end
 
-    it "should be locked if the other process is a puppet gem" do
-      File.write(@lockfile, "1234")
-
-      if Puppet::Util::Platform.windows?
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
-      else
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('ruby')
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
-      end
-      expect(@lock).to be_locked
-    end
-
-    it "should not be mine if the other process is a puppet gem" do
-      File.write(@lockfile, "1234")
-
-      if Puppet::Util::Platform.windows?
-        allow(Puppet::Util::Windows::Process).to receive(:get_process_image_name_by_pid).with(1234).and_return('C:\Program Files\Puppet Labs\Puppet\puppet\bin\ruby.exe')
-      else
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'comm=']).and_return('ruby')
-        allow(Puppet::Util::Execution).to receive(:execute).with(['ps', '-p', 1234, '-o', 'args=']).and_return('ruby /root/puppet/.bundle/ruby/2.3.0/bin/puppet agent --no-daemonize -v')
-      end
-      expect(@lock).to_not be_mine
-    end
-
     describe "#lock" do
       it "should not be possible" do
         expect(@lock.lock).to be_falsey

data/spec/unit/util/plist_spec.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require 'spec_helper'
 require 'puppet/util/plist'
 require 'puppet_spec/files'
@@ -54,19 +52,6 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
     </dict>
     </plist>'
   end
-  let(:ascii_xml_plist) do
-    '<?xml version="1.0" encoding="UTF-8"?>
-     <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-     <plist version="1.0">
-     <dict>
-       <key>RecordName</key>
-         <array>
-           <string>Timișoara</string>
-           <string>Tōkyō</string>
-         </array>
-     </dict>
-     </plist>'.force_encoding(Encoding::US_ASCII)
-  end
   let(:non_plist_data) do
     "Take my love, take my land
      Take me where I cannot stand
@@ -77,7 +62,6 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
     "\xCF\xFA\xED\xFE\a\u0000\u0000\u0001\u0003\u0000\u0000\x80\u0002\u0000\u0000\u0000\u0012\u0000\u0000\u0000\b"
   end
   let(:valid_xml_plist_hash) { {"LastUsedPrinters"=>[{"Network"=>"10.85.132.1", "PrinterID"=>"baskerville_corp_puppetlabs_net"}, {"Network"=>"10.14.96.1", "PrinterID"=>"Statler"}]} }
-  let(:ascii_xml_plist_hash) { {"RecordName"=>["Timișoara", "Tōkyō"]} }
   let(:plist_path) { file_containing('sample.plist', valid_xml_plist) }
   let(:binary_plist_magic_number) { 'bplist00' }
   let(:bad_xml_doctype) { '<!DOCTYPE plist PUBLIC -//Apple Computer' }
@@ -85,60 +69,55 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
 
   describe "#read_plist_file" do
     it "calls #convert_cfpropertylist_to_native_types on a plist object when a valid binary plist is read" do
-      allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return(binary_plist_magic_number)
-      allow(subject).to receive(:new_cfpropertylist).with({:file => plist_path}).and_return('plist_object')
-      expect(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object').and_return('plist_hash')
+      subject.stubs(:read_file_with_offset).with(plist_path, 8).returns(binary_plist_magic_number)
+      subject.stubs(:new_cfpropertylist).with({:file => plist_path}).returns('plist_object')
+      subject.expects(:convert_cfpropertylist_to_native_types).with('plist_object').returns('plist_hash')
       expect(subject.read_plist_file(plist_path)).to eq('plist_hash')
     end
-
     it "returns a valid hash when a valid XML plist is read" do
-      allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
-      allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(valid_xml_plist)
+      subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
+      subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(valid_xml_plist)
       expect(subject.read_plist_file(plist_path)).to eq(valid_xml_plist_hash)
     end
-
     it "raises a debug message and replaces a bad XML plist doctype should one be encountered" do
-      allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
-      allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(bad_xml_doctype)
-      expect(subject).to receive(:new_cfpropertylist).with({:data => good_xml_doctype}).and_return('plist_object')
-      allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object').and_return('plist_hash')
-      expect(Puppet).to receive(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
+      subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
+      subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(bad_xml_doctype)
+      subject.expects(:new_cfpropertylist).with({:data => good_xml_doctype}).returns('plist_object')
+      subject.stubs(:convert_cfpropertylist_to_native_types).with('plist_object').returns('plist_hash')
+      Puppet.expects(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
       expect(subject.read_plist_file(plist_path)).to eq('plist_hash')
     end
-
     it "attempts to read pure xml using plutil when reading an improperly formatted service plist" do
-      allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
-      allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(invalid_xml_plist)
-      expect(Puppet).to receive(:debug).with(/^Failed with CFFormatError/)
-      expect(Puppet).to receive(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
-      expect(Puppet::Util::Execution).to receive(:execute)
+      subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
+      subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(invalid_xml_plist)
+      Puppet.expects(:debug).with(regexp_matches(/^Failed with CFFormatError/))
+      Puppet.expects(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
+      Puppet::Util::Execution.expects(:execute)
         .with(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', plist_path],
               {:failonfail => true, :combine => true})
-        .and_return(Puppet::Util::Execution::ProcessOutput.new(valid_xml_plist, 0))
+        .returns(Puppet::Util::Execution::ProcessOutput.new(valid_xml_plist, 0))
       expect(subject.read_plist_file(plist_path)).to eq(valid_xml_plist_hash)
     end
-
     it "returns nil when direct parsing and plutil conversion both fail" do
-      allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
-      allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(non_plist_data)
-      expect(Puppet).to receive(:debug).with(/^Failed with (CFFormatError|NoMethodError)/)
-      expect(Puppet).to receive(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
-      expect(Puppet::Util::Execution).to receive(:execute)
+      subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
+      subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(non_plist_data)
+      Puppet.expects(:debug).with(regexp_matches(/^Failed with (CFFormatError|NoMethodError)/))
+      Puppet.expects(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
+      Puppet::Util::Execution.expects(:execute)
         .with(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', plist_path],
               {:failonfail => true, :combine => true})
-        .and_raise(Puppet::ExecutionFailure, 'boom')
+        .raises(Puppet::ExecutionFailure, 'boom')
       expect(subject.read_plist_file(plist_path)).to eq(nil)
     end
-
     it "returns nil when file is a non-plist binary blob" do
-      allow(subject).to receive(:read_file_with_offset).with(plist_path, 8).and_return('notbinary')
-      allow(subject).to receive(:open_file_with_args).with(plist_path, 'r:UTF-8').and_return(binary_data)
-      expect(Puppet).to receive(:debug).with(/^Failed with (CFFormatError|ArgumentError)/)
-      expect(Puppet).to receive(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
-      expect(Puppet::Util::Execution).to receive(:execute)
+      subject.stubs(:read_file_with_offset).with(plist_path, 8).returns('notbinary')
+      subject.stubs(:open_file_with_args).with(plist_path, 'r:UTF-8').returns(binary_data)
+      Puppet.expects(:debug).with(regexp_matches(/^Failed with (CFFormatError|ArgumentError)/))
+      Puppet.expects(:debug).with("Plist #{plist_path} ill-formatted, converting with plutil")
+      Puppet::Util::Execution.expects(:execute)
         .with(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', plist_path],
               {:failonfail => true, :combine => true})
-        .and_raise(Puppet::ExecutionFailure, 'boom')
+        .raises(Puppet::ExecutionFailure, 'boom')
       expect(subject.read_plist_file(plist_path)).to eq(nil)
     end
   end
@@ -147,21 +126,15 @@ describe Puppet::Util::Plist, :if => Puppet.features.cfpropertylist? do
     it "returns a valid hash when a valid XML plist is provided" do
       expect(subject.parse_plist(valid_xml_plist)).to eq(valid_xml_plist_hash)
     end
-
-    it "returns a valid hash when an ASCII XML plist is provided" do
-      expect(subject.parse_plist(ascii_xml_plist)).to eq(ascii_xml_plist_hash)
-    end
-
     it "raises a debug message and replaces a bad XML plist doctype should one be encountered" do
-      expect(subject).to receive(:new_cfpropertylist).with({:data => good_xml_doctype}).and_return('plist_object')
-      allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object')
-      expect(Puppet).to receive(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
+      subject.expects(:new_cfpropertylist).with({:data => good_xml_doctype}).returns('plist_object')
+      subject.stubs(:convert_cfpropertylist_to_native_types).with('plist_object')
+      Puppet.expects(:debug).with("Had to fix plist with incorrect DOCTYPE declaration: #{plist_path}")
       subject.parse_plist(bad_xml_doctype, plist_path)
     end
-
     it "raises a debug message with malformed plist" do
-      allow(subject).to receive(:convert_cfpropertylist_to_native_types).with('plist_object')
-      expect(Puppet).to receive(:debug).with(/^Failed with CFFormatError/)
+      subject.stubs(:convert_cfpropertylist_to_native_types).with('plist_object')
+      Puppet.expects(:debug).with(regexp_matches(/^Failed with CFFormatError/))
       subject.parse_plist("<plist><dict><key>Foo</key>")
     end
   end