puppet 6.4.0-universal-darwin → 6.4.1-universal-darwin

data/spec/integration/transaction_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 
@@ -14,7 +13,7 @@ describe Puppet::Transaction do
   include PuppetSpec::Compiler
 
   before do
-    Puppet::Util::Storage.stubs(:store)
+    allow(Puppet::Util::Storage).to receive(:store)
   end
 
   def mk_catalog(*resources)
@@ -42,14 +41,14 @@ describe Puppet::Transaction do
 
     child_resource = Puppet::Type.type(:file).new :path => make_absolute("/foo/bar/baz"), :backup => false
 
-    resource.expects(:eval_generate).returns([child_resource])
+    expect(resource).to receive(:eval_generate).and_return([child_resource])
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
 
-    resource.expects(:retrieve).raises "this is a failure"
-    resource.stubs(:err)
+    expect(resource).to receive(:retrieve).and_raise("this is a failure")
+    allow(resource).to receive(:err)
 
-    child_resource.expects(:retrieve).never
+    expect(child_resource).not_to receive(:retrieve)
 
     transaction.evaluate
   end
@@ -62,7 +61,7 @@ describe Puppet::Transaction do
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
 
-    resource.expects(:evaluate).never
+    expect(resource).not_to receive(:evaluate)
 
     transaction.evaluate
   end
@@ -87,7 +86,7 @@ describe Puppet::Transaction do
 
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
 
-    resource.expects(:evaluate).never
+    expect(resource).not_to receive(:evaluate)
 
     transaction.evaluate
   end
@@ -100,7 +99,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = false
 
-    transaction.expects(:apply).never.with(resource, nil)
+    expect(transaction).not_to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).to be_skipped
@@ -114,7 +113,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = true
 
-    transaction.expects(:apply).never.with(resource, nil)
+    expect(transaction).not_to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).to be_skipped
@@ -128,7 +127,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = true
 
-    transaction.expects(:apply).with(resource, nil)
+    expect(transaction).to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).not_to be_skipped
@@ -142,7 +141,7 @@ describe Puppet::Transaction do
     transaction = Puppet::Transaction.new(catalog, nil, Puppet::Graph::SequentialPrioritizer.new)
     transaction.for_network_device = true
 
-    transaction.expects(:apply).with(resource, nil)
+    expect(transaction).to receive(:apply).with(resource, nil)
 
     transaction.evaluate
     expect(transaction.resource_status(resource)).not_to be_skipped
@@ -168,7 +167,7 @@ describe Puppet::Transaction do
     ecomp[:subscribe] = Puppet::Resource.new(:foo, "file")
     exec[:refreshonly] = true
 
-    exec.expects(:refresh)
+    expect(exec).to receive(:refresh)
     catalog.apply
   end
 
@@ -232,7 +231,7 @@ describe Puppet::Transaction do
     notify = Puppet::Type.type(:notify).new(
       :title => "foo"
     )
-    notify.expects(:pre_run_check).raises(Puppet::Error, "fail for testing")
+    expect(notify).to receive(:pre_run_check).and_raise(Puppet::Error, "fail for testing")
 
     catalog = mk_catalog(file, notify)
     expect { catalog.apply }.to raise_error(Puppet::Error, /Some pre-run checks failed/)
@@ -265,7 +264,7 @@ describe Puppet::Transaction do
       :title => "two"
     )
 
-    exec1.stubs(:err)
+    allow(exec1).to receive(:err)
 
     catalog = mk_catalog(file, exec1, exec2)
     catalog.apply
@@ -322,8 +321,8 @@ describe Puppet::Transaction do
           :command     => touch(file1),
         )
 
-        exec1.stubs(:eval_generate).returns(
-          [ (Puppet::Type.type(:notify).new :name => "eval1_notify")]
+        allow(exec1).to receive(:eval_generate).and_return(
+          [ Puppet::Type.type(:notify).new(:name => "eval1_notify") ]
         )
 
         exec2 = Puppet::Type.type(:exec).new(
@@ -333,8 +332,8 @@ describe Puppet::Transaction do
           :refreshonly => true,
           :subscribe   => exec1,
         )
-        exec2.stubs(:eval_generate).returns(
-          [ (Puppet::Type.type(:notify).new :name => "eval2_notify")]
+        allow(exec2).to receive(:eval_generate).and_return(
+          [ Puppet::Type.type(:notify).new(:name => "eval2_notify") ]
         )
 
         Puppet[:tags] = "exec"

data/spec/integration/type/exec_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/type/file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'
@@ -79,10 +78,10 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   before do
     # stub this to not try to create state.yaml
-    Puppet::Util::Storage.stubs(:store)
+    allow(Puppet::Util::Storage).to receive(:store)
 
-    Puppet::Type.type(:file).any_instance.stubs(:file).returns('my/file.pp')
-    Puppet::Type.type(:file).any_instance.stubs(:line).returns 5
+    allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return('my/file.pp')
+    allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(5)
   end
 
   it "should not attempt to manage files that do not exist if no means of creating the file is specified" do
@@ -419,7 +418,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
             it "should not give a deprecation warning about using a checksum in content when using source to define content" do
               FileUtils.touch(path)
-              Puppet.expects(:puppet_deprecation_warning).never
+              expect(Puppet).not_to receive(:puppet_deprecation_warning)
               catalog.add_resource described_class.new(:path => path, :source => link, :links => :follow)
               catalog.apply
             end
@@ -533,7 +532,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
         # Create a directory where the backup should be so that writing to it fails
         Dir.mkdir(File.join(dir, "testfile.bak"))
 
-        Puppet::Util::Log.stubs(:newmessage)
+        allow(Puppet::Util::Log).to receive(:newmessage)
 
         catalog.apply
 
@@ -603,7 +602,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
 
     it "should not give a checksum deprecation warning when given actual content" do
-      Puppet.expects(:puppet_deprecation_warning).never
+      expect(Puppet).not_to receive(:puppet_deprecation_warning)
       catalog.add_resource described_class.new(:path => path, :content => 'this is content')
       catalog.apply
     end
@@ -614,14 +613,14 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
       end
 
       it "should give a checksum deprecation warning" do
-        Puppet.expects(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
+        expect(Puppet).to receive(:puppet_deprecation_warning).with('Using a checksum in a file\'s "content" property is deprecated. The ability to use a checksum to retrieve content from the filebucket using the "content" property will be removed in a future release. The literal value of the "content" property will be written to the file. The checksum retrieval functionality is being replaced by the use of static catalogs. See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.', {:file => 'my/file.pp', :line => 5})
         d = digest("this is some content")
         catalog.add_resource described_class.new(:path => path, :content => "{#{digest_algorithm}}#{d}")
         catalog.apply
       end
 
       it "should not give a checksum deprecation warning when no content is specified while checksum and checksum value are used" do
-        Puppet.expects(:puppet_deprecation_warning).never
+        expect(Puppet).not_to receive(:puppet_deprecation_warning)
         d = digest("this is some content")
         catalog.add_resource described_class.new(:path => path, :checksum => digest_algorithm, :checksum_value => d)
         catalog.apply
@@ -1282,7 +1281,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
   describe "when sourcing" do
     it "should give a deprecation warning when the user sets source_permissions" do
-      Puppet.expects(:puppet_deprecation_warning).with(
+      expect(Puppet).to receive(:puppet_deprecation_warning).with(
         'The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`.',
         {:file => 'my/file.pp', :line => 5})
 
@@ -1291,7 +1290,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
 
     it "should not give a deprecation warning when the user does not set source_permissions" do
-      Puppet.expects(:puppet_deprecation_warning).never
+      expect(Puppet).not_to receive(:puppet_deprecation_warning)
       catalog.add_resource described_class.new(:path => path, :content => 'this is content')
       catalog.apply
     end
@@ -1683,7 +1682,7 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
   describe "when using validate_cmd" do
     it "should fail the file resource if command fails" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env false"))
-      Puppet::Util::Execution.expects(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).raises(Puppet::ExecutionFailure, "Failed")
+      expect(Puppet::Util::Execution).to receive(:execute).with("/usr/bin/env false", {:combine => true, :failonfail => true}).and_raise(Puppet::ExecutionFailure, "Failed")
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_falsey
@@ -1691,9 +1690,9 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
 
     it "should succeed the file resource if command succeeds" do
       catalog.add_resource(described_class.new(:path => path, :content => "foo", :validate_cmd => "/usr/bin/env true"))
-      Puppet::Util::Execution.expects(:execute)
+      expect(Puppet::Util::Execution).to receive(:execute)
         .with("/usr/bin/env true", {:combine => true, :failonfail => true})
-        .returns Puppet::Util::Execution::ProcessOutput.new('', 0)
+        .and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
       report = catalog.apply.report
       expect(report.resource_statuses["File[#{path}]"]).not_to be_failed
       expect(Puppet::FileSystem.exist?(path)).to be_truthy

data/spec/integration/type/package_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package), "when choosing a default package provider" do
@@ -64,8 +63,8 @@ end
 
 describe Puppet::Type.type(:package), "when packages with the same name are sourced" do
   before :each do
-    Process.stubs(:euid).returns 0
-    @provider = stub(
+    allow(Process).to receive(:euid).and_return(0)
+    @provider = double(
       'provider',
       :class           => Puppet::Type.type(:package).defaultprovider,
       :clear           => nil,
@@ -73,8 +72,8 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
       :name            => :mock,
       :validate_source => nil
     )
-    Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(@provider)
-    Puppet::Type.type(:package).defaultprovider.stubs(:instances).returns([])
+    allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(@provider)
+    allow(Puppet::Type.type(:package).defaultprovider).to receive(:instances).and_return([])
     @package = Puppet::Type.type(:package).new(:name => "yay", :ensure => :present)
 
     @catalog = Puppet::Resource::Catalog.new
@@ -117,18 +116,18 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
     describe "when it should be present" do
       [:present, :latest, "1.0"].each do |state|
         it "should do nothing if it is #{state.to_s}" do
-          @provider.expects(:properties).returns(:ensure => state).at_least_once
-          @alt_provider.expects(:properties).returns(:ensure => state).at_least_once
+          expect(@provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
+          expect(@alt_provider).to receive(:properties).and_return(:ensure => state).at_least(:once)
           @catalog.apply
         end
       end
 
       [:purged, :absent].each do |state|
         it "should install if it is #{state.to_s}" do
-          @provider.stubs(:properties).returns(:ensure => state)
-          @provider.expects(:install)
-          @alt_provider.stubs(:properties).returns(:ensure => state)
-          @alt_provider.expects(:install)
+          allow(@provider).to receive(:properties).and_return(:ensure => state)
+          expect(@provider).to receive(:install)
+          allow(@alt_provider).to receive(:properties).and_return(:ensure => state)
+          expect(@alt_provider).to receive(:install)
           @catalog.apply
         end
       end
@@ -137,18 +136,17 @@ describe Puppet::Type.type(:package), "when packages with the same name are sour
 end
 
 describe Puppet::Type.type(:package), 'logging package state transitions' do
-
   let(:catalog) { Puppet::Resource::Catalog.new }
-  let(:provider) { stub('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
+  let(:provider) { double('provider', :class => Puppet::Type.type(:package).defaultprovider, :clear => nil, :validate_source => nil) }
 
   before :each do
-    Process.stubs(:euid).returns 0
-    provider.stubs(:satisfies?).with([:purgeable]).returns(true)
-    provider.class.stubs(:instances).returns([])
-    provider.stubs(:install).returns nil
-    provider.stubs(:uninstall).returns nil
-    provider.stubs(:purge).returns nil
-    Puppet::Type.type(:package).defaultprovider.stubs(:new).returns(provider)
+    allow(Process).to receive(:euid).and_return(0)
+    allow(provider).to receive(:satisfies?).with([:purgeable]).and_return(true)
+    allow(provider.class).to receive(:instances).and_return([])
+    allow(provider).to receive(:install).and_return(nil)
+    allow(provider).to receive(:uninstall).and_return(nil)
+    allow(provider).to receive(:purge).and_return(nil)
+    allow(Puppet::Type.type(:package).defaultprovider).to receive(:new).and_return(provider)
   end
 
   after :each do
@@ -179,9 +177,8 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
 
   states.each do |old, new_states|
     describe "#{old} package" do
-
       before :each do
-        provider.stubs(:properties).returns(:ensure => old)
+        allow(provider).to receive(:properties).and_return(:ensure => old)
       end
 
       new_states.each do |new, status|
@@ -201,4 +198,3 @@ describe Puppet::Type.type(:package), 'logging package state transitions' do
     end
   end
 end
-

data/spec/integration/type/tidy_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/compiler'
@@ -10,7 +9,7 @@ describe Puppet::Type.type(:tidy) do
   include PuppetSpec::Compiler
 
   before do
-    Puppet::Util::Storage.stubs(:store)
+    allow(Puppet::Util::Storage).to receive(:store)
   end
 
   it "should be able to recursively remove directories" do

data/spec/integration/type_spec.rb

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

data/spec/integration/util/autoload_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/autoload'
@@ -84,7 +83,7 @@ describe Puppet::Util::Autoload do
 
   it "should be able to load files directly from modules" do
     ## modulepath can't be used until after app settings are initialized, so we need to simulate that:
-    Puppet.settings.expects(:app_defaults_initialized?).returns(true).at_least_once
+    expect(Puppet.settings).to receive(:app_defaults_initialized?).and_return(true).at_least(:once)
 
     modulepath = tmpfile("autoload_module_testing")
     libdir = File.join(modulepath, "mymod", "lib", "foo")

data/spec/integration/util/rdoc/parser_spec.rb

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

data/spec/integration/util/settings_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet_spec/files'

data/spec/integration/util/windows/adsi_spec.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/windows'
 
@@ -70,7 +69,6 @@ describe Puppet::Util::Windows::ADSI::Group,
         original_codepage = Encoding.default_external
         Encoding.default_external = Encoding::CP850 # Western Europe
 
-
         Puppet::Util::Windows::ADSI::Group.each do |group|
           expect(group.name.encoding).to be(Encoding::UTF_8)
         end
@@ -135,13 +133,13 @@ describe Puppet::Util::Windows::ADSI::Group,
     it 'should return a list of Principal objects even with unresolvable SIDs' do
       members = [
         # NULL SID is not localized
-        stub('WIN32OLE', {
+        double('WIN32OLE', {
           :objectSID => [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
           :Name => 'NULL SID',
           :ole_respond_to? => true,
         }),
         # unresolvable SID is a different story altogether
-        stub('WIN32OLE', {
+        double('WIN32OLE', {
           # completely valid SID, but Name is just a stringified version
           :objectSID => [1, 5, 0, 0, 0, 0, 0, 5, 21, 0, 0, 0, 5, 113, 65, 218, 15, 127, 9, 57, 219, 4, 84, 126, 88, 4, 0, 0],
           :Name => 'S-1-5-21-3661721861-956923663-2119435483-1112',
@@ -154,7 +152,7 @@ describe Puppet::Util::Windows::ADSI::Group,
 
       # touch the native_object member to have it lazily loaded, so COM objects can be stubbed
       admins.native_object
-      admins.native_object.stubs(:Members).returns(members)
+      allow(admins.native_object).to receive(:Members).and_return(members)
 
       # well-known NULL SID
       expect(admins.members[0].sid).to eq('S-1-0-0')

data/spec/integration/util/windows/principal_spec.rb

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

data/spec/integration/util/windows/process_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 require 'facter'
 
@@ -38,8 +36,8 @@ describe "Puppet::Util::Windows::Process", :if => Puppet::Util::Platform.windows
     after :each do
       # spec\integration\test\test_helper_spec.rb calls set_environment_strings
       # after :all and thus needs access to the real APIs once again
-      Puppet::Util::Windows::Process.unstub(:GetEnvironmentStringsW)
-      Puppet::Util::Windows::Process.unstub(:FreeEnvironmentStringsW)
+      allow(Puppet::Util::Windows::Process).to receive(:GetEnvironmentStringsW).and_call_original
+      allow(Puppet::Util::Windows::Process).to receive(:FreeEnvironmentStringsW).and_call_original
     end
 
     it "will ignore only keys or values with corrupt byte sequences" do
@@ -63,9 +61,9 @@ describe "Puppet::Util::Windows::Process", :if => Puppet::Util::Platform.windows
         ptr.put_array_of_uchar(0, env_var_block_bytes)
 
         # stub the block of memory that the Win32 API would typically return via pointer
-        Puppet::Util::Windows::Process.expects(:GetEnvironmentStringsW).returns(ptr)
+        expect(Puppet::Util::Windows::Process).to receive(:GetEnvironmentStringsW).and_return(ptr)
         # stub out the real API call to free memory, else process crashes
-        Puppet::Util::Windows::Process.expects(:FreeEnvironmentStringsW)
+        expect(Puppet::Util::Windows::Process).to receive(:FreeEnvironmentStringsW)
 
         env_vars = Puppet::Util::Windows::Process.get_environment_strings
       end

data/spec/integration/util/windows/registry_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/windows'
 
@@ -31,8 +30,8 @@ describe Puppet::Util::Windows::Registry do
     TestRegistry.new
   end
 
-  let(:name)   { 'HKEY_LOCAL_MACHINE' }
-  let(:path)   { 'Software\Microsoft' }
+  let(:name) { 'HKEY_LOCAL_MACHINE' }
+  let(:path) { 'Software\Microsoft' }
 
   context "#root" do
     it "should lookup the root hkey" do
@@ -45,17 +44,15 @@ describe Puppet::Util::Windows::Registry do
   end
 
   context "#open" do
-    let(:hkey)   { stub 'hklm' }
-    let(:subkey) { stub 'subkey' }
+    let(:hkey)   { double('hklm') }
+    let(:subkey) { double('subkey') }
 
     before :each do
-      subject.stubs(:root).returns(hkey)
+      allow(subject).to receive(:root).and_return(hkey)
     end
 
     it "should yield the opened the subkey" do
-      hkey.expects(:open).with do |p, _|
-        expect(p).to eq(path)
-      end.yields(subkey)
+      expect(hkey).to receive(:open).with(path, anything).and_yield(subkey)
 
       yielded = nil
       subject.open(name, path) {|reg| yielded = reg}
@@ -66,7 +63,7 @@ describe Puppet::Util::Windows::Registry do
       [described_class::KEY64, described_class::KEY32].each do |access|
         it "should open the key for read access 0x#{access.to_s(16)}" do
           mode = described_class::KEY_READ | access
-          hkey.expects(:open).with(path, mode)
+          expect(hkey).to receive(:open).with(path, mode)
 
           subject.open(name, path, mode) {|reg| }
         end
@@ -74,14 +71,14 @@ describe Puppet::Util::Windows::Registry do
     end
 
     it "should default to KEY64" do
-      hkey.expects(:open).with(path, described_class::KEY_READ | described_class::KEY64)
+      expect(hkey).to receive(:open).with(path, described_class::KEY_READ | described_class::KEY64)
 
       subject.open(hkey, path) {|hkey| }
     end
 
     it "should raise for a path that doesn't exist" do
-      hkey.expects(:keyname).returns('HKEY_LOCAL_MACHINE')
-      hkey.expects(:open).raises(Win32::Registry::Error.new(2)) # file not found
+      expect(hkey).to receive(:keyname).and_return('HKEY_LOCAL_MACHINE')
+      expect(hkey).to receive(:open).and_raise(Win32::Registry::Error.new(2)) # file not found
       expect do
         subject.open(hkey, 'doesnotexist') {|hkey| }
       end.to raise_error(Puppet::Error, /Failed to open registry key 'HKEY_LOCAL_MACHINE\\doesnotexist'/)
@@ -89,34 +86,27 @@ describe Puppet::Util::Windows::Registry do
   end
 
   context "#values" do
-    let(:key) { stub('uninstall') }
-
-    def expects_registry_value(array)
-      key.expects(:each_value).never
-      subject.expects(:each_value).with(key).multiple_yields(array)
-
-      subject.values(key).first[1]
-    end
+    let(:key) { double('uninstall') }
 
     it "should return each value's name and data" do
-      key.expects(:each_value).never
-      subject.expects(:each_value).with(key).multiple_yields(
-        ['string', 1, 'foo'], ['dword', 4, 0]
-      )
+      expect(key).not_to receive(:each_value)
+      expect(subject).to receive(:each_value).with(key).and_yield('string', 1, 'foo').and_yield('dword', 4, 0)
+
       expect(subject.values(key)).to eq({ 'string' => 'foo', 'dword' => 0 })
     end
 
     it "should return an empty hash if there are no values" do
-      key.expects(:each_value).never
-      subject.expects(:each_value).with(key)
+      expect(key).not_to receive(:each_value)
+      expect(subject).to receive(:each_value).with(key)
 
       expect(subject.values(key)).to eq({})
     end
 
     it "passes REG_DWORD through" do
-      reg_value = ['dword', Win32::Registry::REG_DWORD, '1']
+      expect(key).not_to receive(:each_value)
+      expect(subject).to receive(:each_value).with(key).and_yield('dword', Win32::Registry::REG_DWORD, '1')
 
-      value = expects_registry_value(reg_value)
+      value = subject.values(key).first[1]
 
       expect(Integer(value)).to eq(1)
     end
@@ -127,11 +117,11 @@ describe Puppet::Util::Windows::Registry do
       TM_UTF_8 = [0xE2, 0x84, 0xA2]
       TM_UTF_16 = [0x2122]
 
-      let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
-      let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
-      let (:guid) { SecureRandom.uuid }
-      let (:regsam) { Puppet::Util::Windows::Registry::KEY32 }
+      let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
+      let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
+      let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let(:guid) { SecureRandom.uuid }
+      let(:regsam) { Puppet::Util::Windows::Registry::KEY32 }
 
       after(:each) do
         # Ruby 2.1.5 has bugs with deleting registry keys due to using ANSI
@@ -160,11 +150,11 @@ describe Puppet::Util::Windows::Registry do
         # a local codepage which can totally break when that codepage has no
         # conversion from the given UTF-16LE characters to local codepage
         # a prime example is that IBM437 has no conversion from a Unicode en-dash
-        Win32::Registry.expects(:export_string).never
+        expect(Win32::Registry).not_to receive(:export_string)
 
         # also, expect that we're using our variants of keys / values, not Rubys
-        Win32::Registry.expects(:each_key).never
-        Win32::Registry.expects(:each_value).never
+        expect(Win32::Registry).not_to receive(:each_key)
+        expect(Win32::Registry).not_to receive(:each_value)
 
         hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS | regsam) do |reg|
           reg.write("#{guid}", Win32::Registry::REG_SZ, utf_16_str)
@@ -185,10 +175,10 @@ describe Puppet::Util::Windows::Registry do
     end
 
     context "when reading values" do
-      let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
-      let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
-      let (:value_name) { SecureRandom.uuid }
+      let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
+      let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
+      let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let(:value_name) { SecureRandom.uuid }
 
       after(:each) do
         hklm.open(puppet_key, Win32::Registry::KEY_ALL_ACCESS) do |reg|
@@ -226,10 +216,10 @@ describe Puppet::Util::Windows::Registry do
     end
 
     context "when reading corrupt values" do
-      let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
-      let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
-      let (:value_name) { SecureRandom.uuid }
+      let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
+      let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
+      let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let(:value_name) { SecureRandom.uuid }
 
       before(:each) do
         hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg_key|
@@ -255,17 +245,17 @@ describe Puppet::Util::Windows::Registry do
   end
 
   context "#values_by_name" do
-    let(:hkey)   { stub 'hklm' }
-    let(:subkey) { stub 'subkey' }
+    let(:hkey)   { double('hklm') }
+    let(:subkey) { double('subkey') }
 
     before :each do
-      subject.stubs(:root).returns(hkey)
+      allow(subject).to receive(:root).and_return(hkey)
     end
 
     context "when reading values" do
-      let (:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
-      let (:puppet_key) { "SOFTWARE\\Puppet Labs"}
-      let (:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
+      let(:hklm) { Win32::Registry::HKEY_LOCAL_MACHINE }
+      let(:puppet_key) { "SOFTWARE\\Puppet Labs"}
+      let(:subkey_name) { "PuppetRegistryTest#{SecureRandom.uuid}" }
 
       before(:each) do
         hklm.create("#{puppet_key}\\#{subkey_name}", Win32::Registry::KEY_ALL_ACCESS) do |reg|