puppet 6.4.0-x86-mingw32 → 6.4.1-x86-mingw32

data/spec/unit/provider/ldap_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/provider/ldap'
@@ -9,10 +8,10 @@ describe Puppet::Provider::Ldap do
   end
 
   it "should be able to define its manager" do
-    manager = mock 'manager'
-    Puppet::Util::Ldap::Manager.expects(:new).returns manager
-    @class.stubs :mk_resource_methods
-    manager.expects(:manages).with(:one)
+    manager = double('manager')
+    expect(Puppet::Util::Ldap::Manager).to receive(:new).and_return(manager)
+    allow(@class).to receive(:mk_resource_methods)
+    expect(manager).to receive(:manages).with(:one)
     expect(@class.manages(:one)).to equal(manager)
     expect(@class.manager).to equal(manager)
   end
@@ -22,10 +21,10 @@ describe Puppet::Provider::Ldap do
   end
 
   it "should create its resource getter/setter methods when the manager is defined" do
-    manager = mock 'manager'
-    Puppet::Util::Ldap::Manager.expects(:new).returns manager
-    @class.expects :mk_resource_methods
-    manager.stubs(:manages)
+    manager = double('manager')
+    expect(Puppet::Util::Ldap::Manager).to receive(:new).and_return(manager)
+    expect(@class).to receive(:mk_resource_methods)
+    allow(manager).to receive(:manages)
     expect(@class.manages(:one)).to equal(manager)
   end
 
@@ -35,14 +34,14 @@ describe Puppet::Provider::Ldap do
 
   describe "when providing a list of instances" do
     it "should convert all results returned from the manager's :search method into provider instances" do
-      manager = mock 'manager'
-      @class.stubs(:manager).returns manager
+      manager = double('manager')
+      allow(@class).to receive(:manager).and_return(manager)
 
-      manager.expects(:search).returns %w{one two three}
+      expect(manager).to receive(:search).and_return(%w{one two three})
 
-      @class.expects(:new).with("one").returns(1)
-      @class.expects(:new).with("two").returns(2)
-      @class.expects(:new).with("three").returns(3)
+      expect(@class).to receive(:new).with("one").and_return(1)
+      expect(@class).to receive(:new).with("two").and_return(2)
+      expect(@class).to receive(:new).with("three").and_return(3)
 
       expect(@class.instances).to eq([1,2,3])
     end
@@ -54,29 +53,29 @@ describe Puppet::Provider::Ldap do
 
   describe "when prefetching" do
     before do
-      @manager = mock 'manager'
-      @class.stubs(:manager).returns @manager
+      @manager = double('manager')
+      allow(@class).to receive(:manager).and_return(@manager)
 
-      @resource = mock 'resource'
+      @resource = double('resource')
 
       @resources = {"one" => @resource}
     end
 
     it "should find an entry for each passed resource" do
-      @manager.expects(:find).with("one").returns nil
+      expect(@manager).to receive(:find).with("one").and_return(nil)
 
-      @class.stubs(:new)
-      @resource.stubs(:provider=)
+      allow(@class).to receive(:new)
+      allow(@resource).to receive(:provider=)
       @class.prefetch(@resources)
     end
 
     describe "resources that do not exist" do
       it "should create a provider with :ensure => :absent" do
-        @manager.expects(:find).with("one").returns nil
+        expect(@manager).to receive(:find).with("one").and_return(nil)
 
-        @class.expects(:new).with(:ensure => :absent).returns "myprovider"
+        expect(@class).to receive(:new).with(:ensure => :absent).and_return("myprovider")
 
-        @resource.expects(:provider=).with("myprovider")
+        expect(@resource).to receive(:provider=).with("myprovider")
 
         @class.prefetch(@resources)
       end
@@ -84,21 +83,21 @@ describe Puppet::Provider::Ldap do
 
     describe "resources that exist" do
       it "should create a provider with the results of the find" do
-        @manager.expects(:find).with("one").returns("one" => "two")
+        expect(@manager).to receive(:find).with("one").and_return("one" => "two")
 
-        @class.expects(:new).with("one" => "two", :ensure => :present).returns "myprovider"
+        expect(@class).to receive(:new).with("one" => "two", :ensure => :present).and_return("myprovider")
 
-        @resource.expects(:provider=).with("myprovider")
+        expect(@resource).to receive(:provider=).with("myprovider")
 
         @class.prefetch(@resources)
       end
 
       it "should set :ensure to :present in the returned values" do
-        @manager.expects(:find).with("one").returns("one" => "two")
+        expect(@manager).to receive(:find).with("one").and_return("one" => "two")
 
-        @class.expects(:new).with("one" => "two", :ensure => :present).returns "myprovider"
+        expect(@class).to receive(:new).with("one" => "two", :ensure => :present).and_return("myprovider")
 
-        @resource.expects(:provider=).with("myprovider")
+        expect(@resource).to receive(:provider=).with("myprovider")
 
         @class.prefetch(@resources)
       end
@@ -111,22 +110,22 @@ describe Puppet::Provider::Ldap do
     end
 
     it "should fail if the manager is invalid" do
-      manager = stub "manager", :valid? => false
-      @class.stubs(:manager).returns manager
+      manager = double("manager", :valid? => false)
+      allow(@class).to receive(:manager).and_return(manager)
       expect { @class.new }.to raise_error(Puppet::DevError)
     end
 
     describe "with a hash" do
       before do
-        @manager = stub "manager", :valid? => true
-        @class.stubs(:manager).returns @manager
+        @manager = double("manager", :valid? => true)
+        allow(@class).to receive(:manager).and_return(@manager)
 
-        @resource_class = mock 'resource_class'
-        @class.stubs(:resource_type).returns @resource_class
+        @resource_class = double('resource_class')
+        allow(@class).to receive(:resource_type).and_return(@resource_class)
 
-        @property_class = stub 'property_class', :array_matching => :all, :superclass => Puppet::Property
-        @resource_class.stubs(:attrclass).with(:one).returns(@property_class)
-        @resource_class.stubs(:valid_parameter?).returns true
+        @property_class = double('property_class', :array_matching => :all, :superclass => Puppet::Property)
+        allow(@resource_class).to receive(:attrclass).with(:one).and_return(@property_class)
+        allow(@resource_class).to receive(:valid_parameter?).and_return(true)
       end
 
       it "should store a copy of the hash as its ldap_properties" do
@@ -135,29 +134,29 @@ describe Puppet::Provider::Ldap do
       end
 
       it "should only store the first value of each value array for those attributes that do not match all values" do
-        @property_class.expects(:array_matching).returns :first
+        expect(@property_class).to receive(:array_matching).and_return(:first)
         instance = @class.new(:one => %w{two three})
         expect(instance.properties).to eq({:one => "two"})
       end
 
       it "should store the whole value array for those attributes that match all values" do
-        @property_class.expects(:array_matching).returns :all
+        expect(@property_class).to receive(:array_matching).and_return(:all)
         instance = @class.new(:one => %w{two three})
         expect(instance.properties).to eq({:one => %w{two three}})
       end
 
       it "should only use the first value for attributes that are not properties" do
         # Yay.  hackish, but easier than mocking everything.
-        @resource_class.expects(:attrclass).with(:a).returns Puppet::Type.type(:user).attrclass(:name)
-        @property_class.stubs(:array_matching).returns :all
+        expect(@resource_class).to receive(:attrclass).with(:a).and_return(Puppet::Type.type(:user).attrclass(:name))
+        allow(@property_class).to receive(:array_matching).and_return(:all)
 
         instance = @class.new(:one => %w{two three}, :a => %w{b c})
         expect(instance.properties).to eq({:one => %w{two three}, :a => "b"})
       end
 
       it "should discard any properties not valid in the resource class" do
-        @resource_class.expects(:valid_parameter?).with(:a).returns false
-        @property_class.stubs(:array_matching).returns :all
+        expect(@resource_class).to receive(:valid_parameter?).with(:a).and_return(false)
+        allow(@property_class).to receive(:array_matching).and_return(:all)
 
         instance = @class.new(:one => %w{two three}, :a => %w{b})
         expect(instance.properties).to eq({:one => %w{two three}})
@@ -167,13 +166,13 @@ describe Puppet::Provider::Ldap do
 
   describe "when an instance" do
     before do
-      @manager = stub "manager", :valid? => true
-      @class.stubs(:manager).returns @manager
+      @manager = double("manager", :valid? => true)
+      allow(@class).to receive(:manager).and_return(@manager)
       @instance = @class.new
 
-      @property_class = stub 'property_class', :array_matching => :all, :superclass => Puppet::Property
-      @resource_class = stub 'resource_class', :attrclass => @property_class, :valid_parameter? => true, :validproperties => [:one, :two]
-      @class.stubs(:resource_type).returns @resource_class
+      @property_class = double('property_class', :array_matching => :all, :superclass => Puppet::Property)
+      @resource_class = double('resource_class', :attrclass => @property_class, :valid_parameter? => true, :validproperties => [:one, :two])
+      allow(@class).to receive(:resource_type).and_return(@resource_class)
     end
 
     it "should have a method for creating the ldap entry" do
@@ -200,22 +199,22 @@ describe Puppet::Provider::Ldap do
 
     describe "is being flushed" do
       it "should call the manager's :update method with its name, current attributes, and desired attributes" do
-        @instance.stubs(:name).returns "myname"
-        @instance.stubs(:ldap_properties).returns(:one => :two)
-        @instance.stubs(:properties).returns(:three => :four)
-        @manager.expects(:update).with(@instance.name, {:one => :two}, {:three => :four})
+        allow(@instance).to receive(:name).and_return("myname")
+        allow(@instance).to receive(:ldap_properties).and_return(:one => :two)
+        allow(@instance).to receive(:properties).and_return(:three => :four)
+        expect(@manager).to receive(:update).with(@instance.name, {:one => :two}, {:three => :four})
         @instance.flush
       end
     end
 
     describe "is being created" do
       before do
-        @rclass = mock 'resource_class'
-        @rclass.stubs(:validproperties).returns([:one, :two])
-        @resource = mock 'resource'
-        @resource.stubs(:class).returns @rclass
-        @resource.stubs(:should).returns nil
-        @instance.stubs(:resource).returns @resource
+        @rclass = double('resource_class')
+        allow(@rclass).to receive(:validproperties).and_return([:one, :two])
+        @resource = double('resource')
+        allow(@resource).to receive(:class).and_return(@rclass)
+        allow(@resource).to receive(:should).and_return(nil)
+        allow(@instance).to receive(:resource).and_return(@resource)
       end
 
       it "should set its :ensure value to :present" do
@@ -224,8 +223,8 @@ describe Puppet::Provider::Ldap do
       end
 
       it "should set all of the other attributes from the resource" do
-        @resource.expects(:should).with(:one).returns "oneval"
-        @resource.expects(:should).with(:two).returns "twoval"
+        expect(@resource).to receive(:should).with(:one).and_return("oneval")
+        expect(@resource).to receive(:should).with(:two).and_return("twoval")
 
         @instance.create
         expect(@instance.properties[:one]).to eq("oneval")

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -7,8 +7,8 @@ end
 [:group].each do |type_for_this_round|
   describe Puppet::Type.type(type_for_this_round).provider(:directoryservice) do
     before do
-      @resource = stub("resource")
-      @resource.stubs(:[]).with(:name)
+      @resource = double("resource")
+      allow(@resource).to receive(:[]).with(:name)
       @provider = described_class.new(@resource)
     end
 
@@ -17,18 +17,18 @@ end
       desired = ["foo", ["quux"], "qorp"]
       group   = 'example'
 
-      @resource.stubs(:[]).with(:name).returns(group)
-      @resource.stubs(:[]).with(:auth_membership).returns(true)
+      allow(@resource).to receive(:[]).with(:name).and_return(group)
+      allow(@resource).to receive(:[]).with(:auth_membership).and_return(true)
       @provider.instance_variable_set(:@property_value_cache_hash,
                                       { :members => current })
 
       %w{bar baz}.each do |del|
-        @provider.expects(:execute).once.
+        expect(@provider).to receive(:execute).once.
           with([:dseditgroup, '-o', 'edit', '-n', '.', '-d', del, group])
       end
 
       %w{quux qorp}.each do |add|
-        @provider.expects(:execute).once.
+        expect(@provider).to receive(:execute).once.
           with([:dseditgroup, '-o', 'edit', '-n', '.', '-a', add, group])
       end
 
@@ -40,13 +40,13 @@ end
 describe Puppet::Provider::NameService::DirectoryService do
   context '.single_report' do
     it 'should use plist data' do
-      Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
-      Puppet::Provider::NameService::DirectoryService.stubs(:list_all_present).returns(
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:get_ds_path).and_return('Users')
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:list_all_present).and_return(
         ['root', 'user1', 'user2', 'resource_name']
       )
-      Puppet::Provider::NameService::DirectoryService.stubs(:generate_attribute_hash)
-      Puppet::Provider::NameService::DirectoryService.stubs(:execute)
-      Puppet::Provider::NameService::DirectoryService.expects(:parse_dscl_plist_data)
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:generate_attribute_hash)
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:execute)
+      expect(Puppet::Provider::NameService::DirectoryService).to receive(:parse_dscl_plist_data)
 
       Puppet::Provider::NameService::DirectoryService.single_report('resource_name')
     end
@@ -54,7 +54,7 @@ describe Puppet::Provider::NameService::DirectoryService do
 
   context '.get_exec_preamble' do
     it 'should use plist data' do
-      Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:get_ds_path).and_return('Users')
 
       expect(Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list')).to include("-plist")
     end
@@ -85,9 +85,9 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     it 'should execute convert_binary_to_hash once when getting the password' do
-      described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
-      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-      Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
+      expect(described_class).to receive(:convert_binary_to_hash).and_return({'SALTED-SHA512' => pw_string})
+      expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
+      expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return(shadow_hash_data)
       described_class.get_password('uid', 'jeff')
     end
 
@@ -98,19 +98,19 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
-      described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
-      described_class.expects(:convert_hash_to_binary).returns(binary_plist)
-      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-      Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
-      Puppet::Util::Plist.expects(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
+      expect(described_class).to receive(:convert_binary_to_hash).and_return({'SALTED-SHA512' => pw_string})
+      expect(described_class).to receive(:convert_hash_to_binary).and_return(binary_plist)
+      expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
+      expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return(shadow_hash_data)
+      expect(Puppet::Util::Plist).to receive(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
       described_class.set_password('jeff', 'uid', sha512_hash)
     end
 
     it '[#13686] should handle an empty ShadowHashData field in the users plist' do
-      described_class.expects(:convert_hash_to_binary).returns(binary_plist)
-      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-      Puppet::Util::Plist.expects(:read_plist_file).returns({'ShadowHashData' => nil})
-      Puppet::Util::Plist.expects(:write_plist_file)
+      expect(described_class).to receive(:convert_hash_to_binary).and_return(binary_plist)
+      expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
+      expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return({'ShadowHashData' => nil})
+      expect(Puppet::Util::Plist).to receive(:write_plist_file)
       described_class.set_password('jeff', 'uid', sha512_hash)
     end
   end
@@ -129,7 +129,7 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     let :stub_resource do
-      stub('resource')
+      double('resource')
     end
 
     subject do
@@ -137,21 +137,20 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     before :each do
-      @resource = stub("resource")
-      @resource.stubs(:[]).with(:name)
+      @resource = double("resource")
+      allow(@resource).to receive(:[]).with(:name)
       @provider = provider_class.new(@resource)
     end
 
     it 'should delete a group member if the user does not exist' do
-      stub_resource.stubs(:[]).with(:name).returns('fake_group')
-      stub_resource.stubs(:name).returns('fake_group')
-      subject.expects(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
-                                    '-d', 'jeff',
-                                    'fake_group']).raises(Puppet::ExecutionFailure,
-                                    'it broke')
-      subject.expects(:execute).with([:dscl, '.', '-delete',
-                                    '/Groups/fake_group', 'GroupMembership',
-                                    'jeff'])
+      allow(stub_resource).to receive(:[]).with(:name).and_return('fake_group')
+      allow(stub_resource).to receive(:name).and_return('fake_group')
+      expect(subject).to receive(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
+                                                '-d', 'jeff',
+                                                'fake_group']).and_raise(Puppet::ExecutionFailure, 'it broke')
+      expect(subject).to receive(:execute).with([:dscl, '.', '-delete',
+                                                '/Groups/fake_group', 'GroupMembership',
+                                                'jeff'])
       subject.remove_unwanted_members(group_members, user_account)
     end
   end

data/spec/unit/provider/nameservice_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 require 'puppet/provider/nameservice'
 require 'puppet/etc'
@@ -134,7 +132,7 @@ describe Puppet::Provider::NameService do
 
   describe "#section" do
     it "should raise an error if resource_type has not been set" do
-      described_class.expects(:resource_type).returns nil
+      expect(described_class).to receive(:resource_type).and_return(nil)
       expect { described_class.section }.to raise_error Puppet::Error, 'Cannot determine Etc section without a resource type'
     end
 
@@ -153,15 +151,15 @@ describe Puppet::Provider::NameService do
 
   describe "#listbyname" do
     it "should be deprecated" do
-      Puppet.expects(:deprecation_warning).with(regexp_matches(/listbyname is deprecated/))
+      expect(Puppet).to receive(:deprecation_warning).with(/listbyname is deprecated/)
       described_class.listbyname
     end
 
     it "should return a list of users if resource_type is user" do
       described_class.resource_type = Puppet::Type.type(:user)
-      Puppet::Etc.expects(:setpwent)
-      Puppet::Etc.stubs(:getpwent).returns(*users)
-      Puppet::Etc.expects(:endpwent)
+      expect(Puppet::Etc).to receive(:setpwent)
+      allow(Puppet::Etc).to receive(:getpwent).and_return(*users)
+      expect(Puppet::Etc).to receive(:endpwent)
       expect(described_class.listbyname).to eq(%w{root foo})
     end
 
@@ -172,7 +170,7 @@ describe Puppet::Provider::NameService do
       # the same name on disk, but each name is stored on disk in a different
       # encoding
       it "should return names with invalid byte sequences replaced with '?'" do
-        Etc.stubs(:getpwent).returns(*utf_8_mixed_users)
+        allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
         expect(invalid_utf_8_jose).to_not be_valid_encoding
         result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
           described_class.listbyname
@@ -181,7 +179,7 @@ describe Puppet::Provider::NameService do
       end
 
       it "should return names in their original encoding/bytes if they would not be valid UTF-8" do
-        Etc.stubs(:getpwent).returns(*latin_1_mixed_users)
+        allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
         result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
           described_class.listbyname
         end
@@ -191,18 +189,18 @@ describe Puppet::Provider::NameService do
 
     it "should return a list of groups if resource_type is group", :unless => Puppet::Util::Platform.windows? do
       described_class.resource_type = Puppet::Type.type(:group)
-      Puppet::Etc.expects(:setgrent)
-      Puppet::Etc.stubs(:getgrent).returns(*groups)
-      Puppet::Etc.expects(:endgrent)
+      expect(Puppet::Etc).to receive(:setgrent)
+      allow(Puppet::Etc).to receive(:getgrent).and_return(*groups)
+      expect(Puppet::Etc).to receive(:endgrent)
       expect(described_class.listbyname).to eq(%w{root bin})
     end
 
     it "should yield if a block given" do
       yield_results = []
       described_class.resource_type = Puppet::Type.type(:user)
-      Puppet::Etc.expects(:setpwent)
-      Puppet::Etc.stubs(:getpwent).returns(*users)
-      Puppet::Etc.expects(:endpwent)
+      expect(Puppet::Etc).to receive(:setpwent)
+      allow(Puppet::Etc).to receive(:getpwent).and_return(*users)
+      expect(Puppet::Etc).to receive(:endpwent)
       described_class.listbyname {|x| yield_results << x }
       expect(yield_results).to eq(%w{root foo})
     end
@@ -213,7 +211,7 @@ describe Puppet::Provider::NameService do
       # These two tests simulate an environment where there are two users with
       # the same name on disk, but each name is stored on disk in a different
       # encoding
-      Etc.stubs(:getpwent).returns(*utf_8_mixed_users)
+      allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
       result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
         described_class.instances
       end
@@ -228,7 +226,7 @@ describe Puppet::Provider::NameService do
     end
 
     it "should have object names in their original encoding/bytes if they would not be valid UTF-8" do
-      Etc.stubs(:getpwent).returns(*latin_1_mixed_users)
+      allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
       result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
         described_class.instances
       end
@@ -244,8 +242,8 @@ describe Puppet::Provider::NameService do
 
     it "should pass the Puppet::Etc :canonical_name Struct member to the constructor" do
       users = [ Struct::Passwd.new(invalid_utf_8_jose, invalid_utf_8_jose, 1002, 2000), nil ]
-      Etc.stubs(:getpwent).returns(*users)
-      described_class.expects(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
+      allow(Etc).to receive(:getpwent).and_return(*users)
+      expect(described_class).to receive(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
       described_class.instances
     end
   end
@@ -278,19 +276,19 @@ describe Puppet::Provider::NameService do
   describe "getinfo" do
     before :each do
       # with section=foo we'll call Etc.getfoonam instead of getpwnam or getgrnam
-      described_class.stubs(:section).returns 'foo'
+      allow(described_class).to receive(:section).and_return('foo')
       resource # initialize the resource so our provider has a @resource instance variable
     end
 
     it "should return a hash if we can retrieve something" do
-      Puppet::Etc.expects(:send).with(:getfoonam, 'bob').returns fakeetcobject
-      provider.expects(:info2hash).with(fakeetcobject).returns(:foo => 'fooval', :bar => 'barval')
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'bob').and_return(fakeetcobject)
+      expect(provider).to receive(:info2hash).with(fakeetcobject).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider.getinfo(true)).to eq({:foo => 'fooval', :bar => 'barval'})
     end
 
     it "should return nil if we cannot retrieve anything" do
-      Puppet::Etc.expects(:send).with(:getfoonam, 'bob').raises(ArgumentError, "can't find bob")
-      provider.expects(:info2hash).never
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'bob').and_raise(ArgumentError, "can't find bob")
+      expect(provider).not_to receive(:info2hash)
       expect(provider.getinfo(true)).to be_nil
     end
 
@@ -299,13 +297,13 @@ describe Puppet::Provider::NameService do
     # again if needed
     it "should use the instance's @canonical_name to query the system" do
       provider_instance = described_class.new(:name => 'foo', :canonical_name => 'original_foo', :ensure => :present)
-      Puppet::Etc.expects(:send).with(:getfoonam, 'original_foo')
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'original_foo')
       provider_instance.getinfo(true)
     end
 
     it "should use the instance's name instead of canonical_name if not supplied during instantiation" do
       provider_instance = described_class.new(:name => 'foo', :ensure => :present)
-      Puppet::Etc.expects(:send).with(:getfoonam, 'foo')
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'foo')
       provider_instance.getinfo(true)
     end
   end
@@ -319,9 +317,9 @@ describe Puppet::Provider::NameService do
       # expect two method invocations because info2hash calls the method
       # twice if the Struct responds to the propertyname (our fake Struct
       # provides values for :foo and :bar) TODO: Fix that
-      provider.expects(:posixmethod).with(:foo).returns(:foo).twice
-      provider.expects(:posixmethod).with(:bar).returns(:bar).twice
-      provider.expects(:posixmethod).with(:ensure).returns :ensure
+      expect(provider).to receive(:posixmethod).with(:foo).and_return(:foo).twice
+      expect(provider).to receive(:posixmethod).with(:bar).and_return(:bar).twice
+      expect(provider).to receive(:posixmethod).with(:ensure).and_return(:ensure)
       expect(provider.info2hash(fakeetcobject)).to eq({ :foo => 'fooval', :bar => 'barval' })
     end
   end
@@ -351,11 +349,11 @@ describe Puppet::Provider::NameService do
 
   describe "exists?" do
     it "should return true if we can retrieve anything" do
-      provider.expects(:getinfo).with(true).returns(:foo => 'fooval', :bar => 'barval')
+      expect(provider).to receive(:getinfo).with(true).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider).to be_exists
     end
     it "should return false if we cannot retrieve anything" do
-      provider.expects(:getinfo).with(true).returns nil
+      expect(provider).to receive(:getinfo).with(true).and_return(nil)
       expect(provider).not_to be_exists
     end
   end
@@ -364,18 +362,18 @@ describe Puppet::Provider::NameService do
     before(:each) {described_class.resource_type = faketype }
 
     it "should return the correct getinfo value" do
-      provider.expects(:getinfo).with(false).returns(:foo => 'fooval', :bar => 'barval')
+      expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider.get(:bar)).to eq('barval')
     end
 
     it "should unmunge the value first" do
       described_class.options(:bar, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
-      provider.expects(:getinfo).with(false).returns(:foo => 200, :bar => 500)
+      expect(provider).to receive(:getinfo).with(false).and_return(:foo => 200, :bar => 500)
       expect(provider.get(:bar)).to eq(250)
     end
 
     it "should return nil if getinfo cannot retrieve the value" do
-      provider.expects(:getinfo).with(false).returns(:foo => 'fooval', :bar => 'barval')
+      expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider.get(:no_such_key)).to be_nil
     end
 
@@ -392,21 +390,21 @@ describe Puppet::Provider::NameService do
     end
 
     it "should execute the modify command on valid values" do
-      provider.expects(:modifycmd).with(:foo, 100).returns ['/bin/modify', '-f', '100' ]
-      provider.expects(:execute).with(['/bin/modify', '-f', '100'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:modifycmd).with(:foo, 100).and_return(['/bin/modify', '-f', '100' ])
+      expect(provider).to receive(:execute).with(['/bin/modify', '-f', '100'], hash_including(custom_environment: {}))
       provider.set(:foo, 100)
     end
 
     it "should munge the value first" do
       described_class.options(:foo, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
-      provider.expects(:modifycmd).with(:foo, 200).returns(['/bin/modify', '-f', '200' ])
-      provider.expects(:execute).with(['/bin/modify', '-f', '200'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:modifycmd).with(:foo, 200).and_return(['/bin/modify', '-f', '200' ])
+      expect(provider).to receive(:execute).with(['/bin/modify', '-f', '200'], hash_including(custom_environment: {}))
       provider.set(:foo, 100)
     end
 
     it "should fail if the modify command fails" do
-      provider.expects(:modifycmd).with(:foo, 100).returns(['/bin/modify', '-f', '100' ])
-      provider.expects(:execute).with(['/bin/modify', '-f', '100'], kind_of(Hash)).raises(Puppet::ExecutionFailure, "Execution of '/bin/modify' returned 1: some_failure")
+      expect(provider).to receive(:modifycmd).with(:foo, 100).and_return(['/bin/modify', '-f', '100' ])
+      expect(provider).to receive(:execute).with(['/bin/modify', '-f', '100'], kind_of(Hash)).and_raise(Puppet::ExecutionFailure, "Execution of '/bin/modify' returned 1: some_failure")
       expect { provider.set(:foo, 100) }.to raise_error Puppet::Error, /Could not set foo/
     end
   end