puppet 6.0.7-x64-mingw32 → 6.0.8-x64-mingw32

data/spec/unit/provider/command_spec.rb

@@ -9,8 +9,8 @@ describe Puppet::Provider::Command do
   let(:executable) { "foo" }
   let(:executable_absolute_path) { "/foo/bar" }
 
-  let(:executor) { mock('executor') }
-  let(:resolver) { mock('resolver') }
+  let(:executor) { double('executor') }
+  let(:resolver) { double('resolver') }
 
   let(:path_resolves_to_itself) do
     resolves = Object.new
@@ -23,37 +23,37 @@ describe Puppet::Provider::Command do
   end
 
   it "executes a simple command" do
-    executor.expects(:execute).with([executable], no_options)
+    expect(executor).to receive(:execute).with([executable], no_options)
 
     command = Puppet::Provider::Command.new(name, executable, path_resolves_to_itself, executor)
     command.execute()
   end
 
   it "executes a command with extra options" do
-    executor.expects(:execute).with([executable], the_options)
+    expect(executor).to receive(:execute).with([executable], the_options)
 
     command = Puppet::Provider::Command.new(name, executable, path_resolves_to_itself, executor, the_options)
     command.execute()
   end
 
   it "executes a command with arguments" do
-    executor.expects(:execute).with([executable, "arg1", "arg2"], no_options)
+    expect(executor).to receive(:execute).with([executable, "arg1", "arg2"], no_options)
 
     command = Puppet::Provider::Command.new(name, executable, path_resolves_to_itself, executor)
     command.execute("arg1", "arg2")
   end
 
   it "resolves to an absolute path for better execution" do
-    resolver.expects(:which).with(executable).returns(executable_absolute_path)
-    executor.expects(:execute).with([executable_absolute_path], no_options)
+    expect(resolver).to receive(:which).with(executable).and_return(executable_absolute_path)
+    expect(executor).to receive(:execute).with([executable_absolute_path], no_options)
 
     command = Puppet::Provider::Command.new(name, executable, resolver, executor)
     command.execute()
   end
 
   it "errors when the executable resolves to nothing" do
-    resolver.expects(:which).with(executable).returns(nil)
-    executor.expects(:execute).never
+    expect(resolver).to receive(:which).with(executable).and_return(nil)
+    expect(executor).not_to receive(:execute)
 
     command = Puppet::Provider::Command.new(name, executable, resolver, executor)
 

data/spec/unit/provider/exec/posix_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix? do
@@ -51,7 +50,7 @@ describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix
 
       it "should fail if the command isn't executable" do
         FileUtils.touch(command)
-        File.stubs(:executable?).with(command).returns(false)
+        allow(File).to receive(:executable?).with(command).and_return(false)
 
         expect { provider.run(command) }.to raise_error(ArgumentError, "'#{command}' is not executable")
       end
@@ -63,7 +62,7 @@ describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix
         provider.resource[:path] = [File.dirname(command)]
         filename = File.basename(command)
 
-        Puppet::Util::Execution.expects(:execute).with(filename, instance_of(Hash)).returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
+        expect(Puppet::Util::Execution).to receive(:execute).with(filename, instance_of(Hash)).and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
 
         provider.run(filename)
       end
@@ -77,7 +76,7 @@ describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix
       it "should fail if the command is in the path but not executable" do
         command = make_exe
         File.chmod(0644, command)
-        FileTest.stubs(:executable?).with(command).returns(false)
+        allow(FileTest).to receive(:executable?).with(command).and_return(false)
         resource[:path] = [File.dirname(command)]
         filename = File.basename(command)
 
@@ -94,7 +93,7 @@ describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix
       provider.resource[:path] = ['/bogus/bin']
       command = make_exe
 
-      Puppet::Util::Execution.expects(:execute).with("#{command} bar --sillyarg=true --blah", instance_of(Hash)).returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
+      expect(Puppet::Util::Execution).to receive(:execute).with("#{command} bar --sillyarg=true --blah", instance_of(Hash)).and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
 
       provider.run("#{command} bar --sillyarg=true --blah")
     end
@@ -110,7 +109,7 @@ describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix
       provider.resource[:environment] = ['WHATEVER=/something/else', 'WHATEVER=/foo']
       command = make_exe
 
-      Puppet::Util::Execution.expects(:execute).with(command, instance_of(Hash)).returns(Puppet::Util::Execution::ProcessOutput.new('', 0))
+      expect(Puppet::Util::Execution).to receive(:execute).with(command, instance_of(Hash)).and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
 
       provider.run(command)
 
@@ -119,7 +118,7 @@ describe Puppet::Type.type(:exec).provider(:posix), :if => Puppet.features.posix
 
     it "should set umask before execution if umask parameter is in use" do
       provider.resource[:umask] = '0027'
-      Puppet::Util.expects(:withumask).with(0027)
+      expect(Puppet::Util).to receive(:withumask).with(0027)
       provider.run(provider.resource[:command])
     end
 

data/spec/unit/provider/exec/shell_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:exec).provider(:shell),

data/spec/unit/provider/exec/windows_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 
 describe Puppet::Type.type(:exec).provider(:windows), :if => Puppet::Util::Platform.windows? do
@@ -68,12 +66,12 @@ describe Puppet::Type.type(:exec).provider(:windows), :if => Puppet::Util::Platf
     describe "when the command is relative" do
       describe "and a path is specified" do
         before :each do
-          provider.stubs(:which)
+          allow(provider).to receive(:which)
         end
 
         it "should search for executables with no extension" do
           provider.resource[:path] = [File.expand_path('/bogus/bin')]
-          provider.expects(:which).with('foo').returns('foo')
+          expect(provider).to receive(:which).with('foo').and_return('foo')
 
           provider.checkexe('foo')
         end

data/spec/unit/provider/exec_spec.rb

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

data/spec/unit/provider/file/posix_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 
 describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix? do
@@ -41,7 +39,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
 
   describe "#uid2name" do
     it "should return the name of the user identified by the id" do
-      Etc.stubs(:getpwuid).with(501).returns(Struct::Passwd.new('jilluser', nil, 501))
+      allow(Etc).to receive(:getpwuid).with(501).and_return(Struct::Passwd.new('jilluser', nil, 501))
 
       expect(provider.uid2name(501)).to eq('jilluser')
     end
@@ -55,7 +53,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     end
 
     it "should return nil if the user doesn't exist" do
-      Etc.expects(:getpwuid).raises(ArgumentError, "can't find user for 999")
+      expect(Etc).to receive(:getpwuid).and_raise(ArgumentError, "can't find user for 999")
 
       expect(provider.uid2name(999)).to eq(nil)
     end
@@ -65,8 +63,8 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     it "should return the id of the user if it exists" do
       passwd = Struct::Passwd.new('bobbo', nil, 502)
 
-      Etc.stubs(:getpwnam).with('bobbo').returns(passwd)
-      Etc.stubs(:getpwuid).with(502).returns(passwd)
+      allow(Etc).to receive(:getpwnam).with('bobbo').and_return(passwd)
+      allow(Etc).to receive(:getpwuid).with(502).and_return(passwd)
 
       expect(provider.name2uid('bobbo')).to eq(502)
     end
@@ -76,7 +74,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     end
 
     it "should return false if the user doesn't exist" do
-      Etc.stubs(:getpwnam).with('chuck').raises(ArgumentError, "can't find user for chuck")
+      allow(Etc).to receive(:getpwnam).with('chuck').and_raise(ArgumentError, "can't find user for chuck")
 
       expect(provider.name2uid('chuck')).to eq(false)
     end
@@ -95,8 +93,8 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     end
 
     it "should warn and return :silly if the value is beyond the maximum uid" do
-      stat = stub('stat', :uid => Puppet[:maximum_uid] + 1)
-      resource.stubs(:stat).returns(stat)
+      stat = double('stat', :uid => Puppet[:maximum_uid] + 1)
+      allow(resource).to receive(:stat).and_return(stat)
 
       expect(provider.owner).to eq(:silly)
       expect(@logs).to be_any {|log| log.level == :warning and log.message =~ /Apparently using negative UID/}
@@ -105,27 +103,27 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
 
   describe "#owner=" do
     it "should set the owner but not the group of the file" do
-      File.expects(:lchown).with(15, nil, resource[:path])
+      expect(File).to receive(:lchown).with(15, nil, resource[:path])
 
       provider.owner = 15
     end
 
     it "should chown a link if managing links" do
       resource[:links] = :manage
-      File.expects(:lchown).with(20, nil, resource[:path])
+      expect(File).to receive(:lchown).with(20, nil, resource[:path])
 
       provider.owner = 20
     end
 
     it "should chown a link target if following links" do
       resource[:links] = :follow
-      File.expects(:chown).with(20, nil, resource[:path])
+      expect(File).to receive(:chown).with(20, nil, resource[:path])
 
       provider.owner = 20
     end
 
     it "should pass along any error encountered setting the owner" do
-      File.expects(:lchown).raises(ArgumentError)
+      expect(File).to receive(:lchown).and_raise(ArgumentError)
 
       expect { provider.owner = 25 }.to raise_error(Puppet::Error, /Failed to set owner to '25'/)
     end
@@ -133,7 +131,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
 
   describe "#gid2name" do
     it "should return the name of the group identified by the id" do
-      Etc.stubs(:getgrgid).with(501).returns(Struct::Passwd.new('unicorns', nil, nil, 501))
+      allow(Etc).to receive(:getgrgid).with(501).and_return(Struct::Passwd.new('unicorns', nil, nil, 501))
 
       expect(provider.gid2name(501)).to eq('unicorns')
     end
@@ -147,7 +145,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     end
 
     it "should return nil if the group doesn't exist" do
-      Etc.expects(:getgrgid).raises(ArgumentError, "can't find group for 999")
+      expect(Etc).to receive(:getgrgid).and_raise(ArgumentError, "can't find group for 999")
 
       expect(provider.gid2name(999)).to eq(nil)
     end
@@ -157,8 +155,8 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     it "should return the id of the group if it exists" do
       passwd = Struct::Passwd.new('penguins', nil, nil, 502)
 
-      Etc.stubs(:getgrnam).with('penguins').returns(passwd)
-      Etc.stubs(:getgrgid).with(502).returns(passwd)
+      allow(Etc).to receive(:getgrnam).with('penguins').and_return(passwd)
+      allow(Etc).to receive(:getgrgid).with(502).and_return(passwd)
 
       expect(provider.name2gid('penguins')).to eq(502)
     end
@@ -168,7 +166,7 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     end
 
     it "should return false if the group doesn't exist" do
-      Etc.stubs(:getgrnam).with('wombats').raises(ArgumentError, "can't find group for wombats")
+      allow(Etc).to receive(:getgrnam).with('wombats').and_raise(ArgumentError, "can't find group for wombats")
 
       expect(provider.name2gid('wombats')).to eq(false)
     end
@@ -188,8 +186,8 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
     end
 
     it "should warn and return :silly if the value is beyond the maximum gid" do
-      stat = stub('stat', :gid => Puppet[:maximum_uid] + 1)
-      resource.stubs(:stat).returns(stat)
+      stat = double('stat', :gid => Puppet[:maximum_uid] + 1)
+      allow(resource).to receive(:stat).and_return(stat)
 
       expect(provider.group).to eq(:silly)
       expect(@logs).to be_any {|log| log.level == :warning and log.message =~ /Apparently using negative GID/}
@@ -198,27 +196,27 @@ describe Puppet::Type.type(:file).provider(:posix), :if => Puppet.features.posix
 
   describe "#group=" do
     it "should set the group but not the owner of the file" do
-      File.expects(:lchown).with(nil, 15, resource[:path])
+      expect(File).to receive(:lchown).with(nil, 15, resource[:path])
 
       provider.group = 15
     end
 
     it "should change the group for a link if managing links" do
       resource[:links] = :manage
-      File.expects(:lchown).with(nil, 20, resource[:path])
+      expect(File).to receive(:lchown).with(nil, 20, resource[:path])
 
       provider.group = 20
     end
 
     it "should change the group for a link target if following links" do
       resource[:links] = :follow
-      File.expects(:chown).with(nil, 20, resource[:path])
+      expect(File).to receive(:chown).with(nil, 20, resource[:path])
 
       provider.group = 20
     end
 
     it "should pass along any error encountered setting the group" do
-      File.expects(:lchown).raises(ArgumentError)
+      expect(File).to receive(:lchown).and_raise(ArgumentError)
 
       expect { provider.group = 25 }.to raise_error(Puppet::Error, /Failed to set group to '25'/)
     end

data/spec/unit/provider/file/windows_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 if Puppet::Util::Platform.windows?
   require 'puppet/util/windows'
@@ -49,22 +47,22 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
 
   describe "#id2name" do
     it "should return the name of the user identified by the sid" do
-      Puppet::Util::Windows::SID.expects(:valid_sid?).with(sid).returns(true)
-      Puppet::Util::Windows::SID.expects(:sid_to_name).with(sid).returns(account)
+      expect(Puppet::Util::Windows::SID).to receive(:valid_sid?).with(sid).and_return(true)
+      expect(Puppet::Util::Windows::SID).to receive(:sid_to_name).with(sid).and_return(account)
 
       expect(provider.id2name(sid)).to eq(account)
     end
 
     it "should return the argument if it's already a name" do
-      Puppet::Util::Windows::SID.expects(:valid_sid?).with(account).returns(false)
-      Puppet::Util::Windows::SID.expects(:sid_to_name).never
+      expect(Puppet::Util::Windows::SID).to receive(:valid_sid?).with(account).and_return(false)
+      expect(Puppet::Util::Windows::SID).not_to receive(:sid_to_name)
 
       expect(provider.id2name(account)).to eq(account)
     end
 
     it "should return nil if the user doesn't exist" do
-      Puppet::Util::Windows::SID.expects(:valid_sid?).with(sid).returns(true)
-      Puppet::Util::Windows::SID.expects(:sid_to_name).with(sid).returns(nil)
+      expect(Puppet::Util::Windows::SID).to receive(:valid_sid?).with(sid).and_return(true)
+      expect(Puppet::Util::Windows::SID).to receive(:sid_to_name).with(sid).and_return(nil)
 
       expect(provider.id2name(sid)).to eq(nil)
     end
@@ -72,7 +70,7 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
 
   describe "#name2id" do
     it "should delegate to name_to_sid" do
-      Puppet::Util::Windows::SID.expects(:name_to_sid).with(account).returns(sid)
+      expect(Puppet::Util::Windows::SID).to receive(:name_to_sid).with(account).and_return(sid)
 
       expect(provider.name2id(account)).to eq(sid)
     end
@@ -81,7 +79,7 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
   describe "#owner" do
     it "should return the sid of the owner if the file does exist" do
       FileUtils.touch(resource[:path])
-      provider.stubs(:get_owner).with(resource[:path]).returns(sid)
+      allow(provider).to receive(:get_owner).with(resource[:path]).and_return(sid)
 
       expect(provider.owner).to eq(sid)
     end
@@ -93,12 +91,12 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
 
   describe "#owner=" do
     it "should set the owner to the specified value" do
-      provider.expects(:set_owner).with(sid, resource[:path])
+      expect(provider).to receive(:set_owner).with(sid, resource[:path])
       provider.owner = sid
     end
 
     it "should propagate any errors encountered when setting the owner" do
-      provider.stubs(:set_owner).raises(ArgumentError)
+      allow(provider).to receive(:set_owner).and_raise(ArgumentError)
 
       expect {
         provider.owner = sid
@@ -109,7 +107,7 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
   describe "#group" do
     it "should return the sid of the group if the file does exist" do
       FileUtils.touch(resource[:path])
-      provider.stubs(:get_group).with(resource[:path]).returns(sid)
+      allow(provider).to receive(:get_group).with(resource[:path]).and_return(sid)
 
       expect(provider.group).to eq(sid)
     end
@@ -121,12 +119,12 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
 
   describe "#group=" do
     it "should set the group to the specified value" do
-      provider.expects(:set_group).with(sid, resource[:path])
+      expect(provider).to receive(:set_group).with(sid, resource[:path])
       provider.group = sid
     end
 
     it "should propagate any errors encountered when setting the group" do
-      provider.stubs(:set_group).raises(ArgumentError)
+      allow(provider).to receive(:set_group).and_raise(ArgumentError)
 
       expect {
         provider.group = sid
@@ -137,7 +135,7 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
   describe "when validating" do
     {:owner => 'foo', :group => 'foo', :mode => '0777'}.each do |k,v|
       it "should fail if the filesystem doesn't support ACLs and we're managing #{k}" do
-        described_class.any_instance.stubs(:supports_acl?).returns false
+        allow_any_instance_of(described_class).to receive(:supports_acl?).and_return(false)
 
         expect {
           Puppet::Type.type(:file).new :path => path, k => v
@@ -146,7 +144,7 @@ describe Puppet::Type.type(:file).provider(:windows), :if => Puppet::Util::Platf
     end
 
     it "should not fail if the filesystem doesn't support ACLs and we're not managing permissions" do
-      described_class.any_instance.stubs(:supports_acl?).returns false
+      allow_any_instance_of(described_class).to receive(:supports_acl?).and_return(false)
 
       Puppet::Type.type(:file).new :path => path
     end

data/spec/unit/provider/group/aix_spec.rb

@@ -9,6 +9,7 @@ describe 'Puppet::Type::Group::Provider::Aix' do
       :ensure => :present
     )
   end
+
   let(:provider) do
     provider_class.new(resource)
   end
@@ -33,7 +34,7 @@ describe 'Puppet::Type::Group::Provider::Aix' do
     end
 
     before(:each) do
-      provider_class.stubs(:list_all).with(ia_module_args).returns(groups)
+      allow(provider_class).to receive(:list_all).with(ia_module_args).and_return(groups)
     end
 
     it 'raises an ArgumentError if the group does not exist' do
@@ -78,7 +79,7 @@ describe 'Puppet::Type::Group::Provider::Aix' do
       before(:each) do
         resource[:auth_membership] = false
 
-        provider.stubs(:members).returns(['user3', 'user1'])
+        allow(provider).to receive(:members).and_return(['user3', 'user1'])
       end
 
       it 'adds the passed-in members to the current list of members, filtering out any duplicates' do

data/spec/unit/provider/group/groupadd_spec.rb

@@ -1,14 +1,15 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
+RSpec::Matchers.define_negated_matcher :excluding, :include
+
 describe Puppet::Type.type(:group).provider(:groupadd) do
   before do
-    described_class.stubs(:command).with(:add).returns '/usr/sbin/groupadd'
-    described_class.stubs(:command).with(:delete).returns '/usr/sbin/groupdel'
-    described_class.stubs(:command).with(:modify).returns '/usr/sbin/groupmod'
-    described_class.stubs(:command).with(:localadd).returns '/usr/sbin/lgroupadd'
-    described_class.stubs(:command).with(:localdelete).returns '/usr/sbin/lgroupdel'
-    described_class.stubs(:command).with(:localmodify).returns '/usr/sbin/lgroupmod'
+    allow(described_class).to receive(:command).with(:add).and_return('/usr/sbin/groupadd')
+    allow(described_class).to receive(:command).with(:delete).and_return('/usr/sbin/groupdel')
+    allow(described_class).to receive(:command).with(:modify).and_return('/usr/sbin/groupmod')
+    allow(described_class).to receive(:command).with(:localadd).and_return('/usr/sbin/lgroupadd')
+    allow(described_class).to receive(:command).with(:localdelete).and_return('/usr/sbin/lgroupdel')
+    allow(described_class).to receive(:command).with(:localmodify).and_return('/usr/sbin/lgroupmod')
   end
 
   let(:resource) { Puppet::Type.type(:group).new(:name => 'mygroup', :provider => provider) }
@@ -16,19 +17,19 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
 
   describe "#create" do
     before do
-       provider.stubs(:exists?).returns(false)
+       allow(provider).to receive(:exists?).and_return(false)
     end
 
     it "should add -o when allowdupe is enabled and the group is being created" do
       resource[:allowdupe] = :true
-      provider.expects(:execute).with(['/usr/sbin/groupadd', '-o', 'mygroup'], kind_of(Hash))
+      expect(provider).to receive(:execute).with(['/usr/sbin/groupadd', '-o', 'mygroup'], kind_of(Hash))
       provider.create
     end
 
     describe "on system that feature system_groups", :if => described_class.system_groups? do
       it "should add -r when system is enabled and the group is being created" do
         resource[:system] = :true
-        provider.expects(:execute).with(['/usr/sbin/groupadd', '-r', 'mygroup'], kind_of(Hash))
+        expect(provider).to receive(:execute).with(['/usr/sbin/groupadd', '-r', 'mygroup'], kind_of(Hash))
         provider.create
       end
     end
@@ -36,7 +37,7 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
     describe "on system that do not feature system_groups", :unless => described_class.system_groups? do
       it "should not add -r when system is enabled and the group is being created" do
         resource[:system] = :true
-        provider.expects(:execute).with(['/usr/sbin/groupadd', 'mygroup'], kind_of(Hash))
+        expect(provider).to receive(:execute).with(['/usr/sbin/groupadd', 'mygroup'], kind_of(Hash))
         provider.create
       end
     end
@@ -48,29 +49,29 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
       end
  
       it "should use lgroupadd instead of groupadd" do
-        provider.expects(:execute).with(includes('/usr/sbin/lgroupadd'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(including('/usr/sbin/lgroupadd'), hash_including(:custom_environment => hash_including('LIBUSER_CONF')))
         provider.create
       end
 
       it "should NOT pass -o to lgroupadd" do
         resource[:allowdupe] = :true
-        provider.expects(:execute).with(Not(includes('-o')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(excluding('-o'), hash_including(:custom_environment => hash_including('LIBUSER_CONF')))
         provider.create
       end
 
       it "should raise an exception for duplicate GID if allowdupe is not set and duplicate GIDs exist" do
         resource[:gid] = 505
-        provider.stubs(:findgroup).returns(true)
+        allow(provider).to receive(:findgroup).and_return(true)
         expect { provider.create }.to raise_error(Puppet::Error, "GID 505 already exists, use allowdupe to force group creation")
      end
     end
-
   end
 
   describe "#modify" do
     before do
-       provider.stubs(:exists?).returns(true)
+       allow(provider).to receive(:exists?).and_return(true)
     end
+
     describe "on systems with the libuser and forcelocal=false" do
       before do
         described_class.has_feature(:libuser)
@@ -78,16 +79,17 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
       end
 
       it "should use groupmod" do
-        provider.expects(:execute).with(['/usr/sbin/groupmod', '-g', 150, 'mygroup'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/sbin/groupmod', '-g', 150, 'mygroup'], hash_including({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.gid = 150
       end
 
       it "should pass -o to groupmod" do
         resource[:allowdupe] = :true
-        provider.expects(:execute).with(['/usr/sbin/groupmod', '-g', 150, '-o', 'mygroup'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/sbin/groupmod', '-g', 150, '-o', 'mygroup'], hash_including({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.gid = 150
       end
     end
+
     describe "on systems with the libuser and forcelocal=true" do
       before do
         described_class.has_feature(:libuser)
@@ -95,19 +97,20 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
       end
 
       it "should use lgroupmod instead of groupmod" do
-        provider.expects(:execute).with(['/usr/sbin/lgroupmod', '-g', 150, 'mygroup'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lgroupmod', '-g', 150, 'mygroup'], hash_including(:custom_environment => hash_including('LIBUSER_CONF')))
         provider.gid = 150
       end
 
       it "should NOT pass -o to lgroupmod" do
         resource[:allowdupe] = :true
-        provider.expects(:execute).with(['/usr/sbin/lgroupmod', '-g', 150, 'mygroup'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lgroupmod', '-g', 150, 'mygroup'], hash_including(:custom_environment => hash_including('LIBUSER_CONF')))
         provider.gid = 150
       end
+
       it "should raise an exception for duplicate GID if allowdupe is not set and duplicate GIDs exist" do
         resource[:gid] = 150
         resource[:allowdupe] = :false
-        provider.stubs(:findgroup).returns(true)
+        allow(provider).to receive(:findgroup).and_return(true)
         expect { provider.gid = 150 }.to raise_error(Puppet::Error, "GID 150 already exists, use allowdupe to force group creation")
      end
     end
@@ -116,15 +119,16 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
   describe "#gid=" do
     it "should add -o when allowdupe is enabled and the gid is being modified" do
       resource[:allowdupe] = :true
-      provider.expects(:execute).with(['/usr/sbin/groupmod', '-g', 150, '-o', 'mygroup'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+      expect(provider).to receive(:execute).with(['/usr/sbin/groupmod', '-g', 150, '-o', 'mygroup'], hash_including({:failonfail => true, :combine => true, :custom_environment => {}}))
       provider.gid = 150
     end
   end
 
   describe "#delete" do
     before do
-       provider.stubs(:exists?).returns(true)
+      allow(provider).to receive(:exists?).and_return(true)
     end
+
     describe "on systems with the libuser and forcelocal=false" do
       before do
         described_class.has_feature(:libuser)
@@ -132,10 +136,11 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
       end
 
       it "should use groupdel" do
-        provider.expects(:execute).with(['/usr/sbin/groupdel', 'mygroup'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/sbin/groupdel', 'mygroup'], hash_including({:failonfail => true, :combine => true, :custom_environment => {}}))
         provider.delete
       end
     end
+
     describe "on systems with the libuser and forcelocal=true" do
       before do
         described_class.has_feature(:libuser)
@@ -143,10 +148,9 @@ describe Puppet::Type.type(:group).provider(:groupadd) do
       end
 
       it "should use lgroupdel instead of groupdel" do
-        provider.expects(:execute).with(['/usr/sbin/lgroupdel', 'mygroup'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lgroupdel', 'mygroup'], hash_including(:custom_environment => hash_including('LIBUSER_CONF')))
         provider.delete
       end
     end
   end
 end
-