puppet 5.5.12-x64-mingw32 → 5.5.13-x64-mingw32

data/spec/unit/provider/user/user_role_add_spec.rb

@@ -8,123 +8,123 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
   let(:provider) { described_class.new(resource) }
 
   before do
-    resource.stubs(:should).returns "fakeval"
-    resource.stubs(:should).with(:keys).returns Hash.new
-    resource.stubs(:[]).returns "fakeval"
+    allow(resource).to receive(:should).and_return("fakeval")
+    allow(resource).to receive(:should).with(:keys).and_return(Hash.new)
+    allow(resource).to receive(:[]).and_return("fakeval")
   end
 
-
   describe "#command" do
     before do
-      klass = stub("provider")
-      klass.stubs(:command).with(:foo).returns("userfoo")
-      klass.stubs(:command).with(:role_foo).returns("rolefoo")
-      provider.stubs(:class).returns(klass)
+      klass = double("provider")
+      allow(klass).to receive(:superclass)
+      allow(klass).to receive(:command).with(:foo).and_return("userfoo")
+      allow(klass).to receive(:command).with(:role_foo).and_return("rolefoo")
+      allow(provider).to receive(:class).and_return(klass)
     end
 
     it "should use the command if not a role and ensure!=role" do
-      provider.stubs(:is_role?).returns(false)
-      provider.stubs(:exists?).returns(false)
-      resource.stubs(:[]).with(:ensure).returns(:present)
-      provider.class.stubs(:foo)
+      allow(provider).to receive(:is_role?).and_return(false)
+      allow(provider).to receive(:exists?).and_return(false)
+      allow(resource).to receive(:[]).with(:ensure).and_return(:present)
+      allow(provider.class).to receive(:foo)
       expect(provider.command(:foo)).to eq("userfoo")
     end
 
     it "should use the role command when a role" do
-      provider.stubs(:is_role?).returns(true)
+      allow(provider).to receive(:is_role?).and_return(true)
       expect(provider.command(:foo)).to eq("rolefoo")
     end
 
     it "should use the role command when !exists and ensure=role" do
-      provider.stubs(:is_role?).returns(false)
-      provider.stubs(:exists?).returns(false)
-      resource.stubs(:[]).with(:ensure).returns(:role)
+      allow(provider).to receive(:is_role?).and_return(false)
+      allow(provider).to receive(:exists?).and_return(false)
+      allow(resource).to receive(:[]).with(:ensure).and_return(:role)
       expect(provider.command(:foo)).to eq("rolefoo")
     end
   end
 
   describe "#transition" do
     it "should return the type set to whatever is passed in" do
-      provider.expects(:command).with(:modify).returns("foomod")
+      expect(provider).to receive(:command).with(:modify).and_return("foomod")
       provider.transition("bar").include?("type=bar")
     end
   end
 
   describe "#create" do
     before do
-      provider.stubs(:password=)
+      allow(provider).to receive(:password=)
     end
 
     it "should use the add command when the user is not a role" do
-      provider.stubs(:is_role?).returns(false)
-      provider.expects(:addcmd).returns("useradd")
-      provider.expects(:run).at_least_once
+      allow(provider).to receive(:is_role?).and_return(false)
+      expect(provider).to receive(:addcmd).and_return("useradd")
+      expect(provider).to receive(:run).at_least(:once)
       provider.create
     end
 
     it "should use transition(normal) when the user is a role" do
-      provider.stubs(:is_role?).returns(true)
-      provider.expects(:transition).with("normal")
-      provider.expects(:run)
+      allow(provider).to receive(:is_role?).and_return(true)
+      expect(provider).to receive(:transition).with("normal")
+      expect(provider).to receive(:run)
       provider.create
     end
 
     it "should set password age rules" do
       resource = Puppet::Type.type(:user).new :name => "myuser", :password_min_age => 5, :password_max_age => 10, :password_warn_days => 15, :provider => :user_role_add
       provider = described_class.new(resource)
-      provider.stubs(:user_attributes)
-      provider.stubs(:execute)
-      provider.expects(:execute).with { |cmd, *args| args == ["-n", 5, "-x", 10, '-w', 15, "myuser"] }
+      allow(provider).to receive(:user_attributes)
+      allow(provider).to receive(:execute)
+      expect(provider).to receive(:execute).with([anything, "-n", 5, "-x", 10, '-w', 15, "myuser"])
       provider.create
     end
   end
 
   describe "#destroy" do
     it "should use the delete command if the user exists and is not a role" do
-      provider.stubs(:exists?).returns(true)
-      provider.stubs(:is_role?).returns(false)
-      provider.expects(:deletecmd)
-      provider.expects(:run)
+      allow(provider).to receive(:exists?).and_return(true)
+      allow(provider).to receive(:is_role?).and_return(false)
+      expect(provider).to receive(:deletecmd)
+      expect(provider).to receive(:run)
       provider.destroy
     end
 
     it "should use the delete command if the user is a role" do
-      provider.stubs(:exists?).returns(true)
-      provider.stubs(:is_role?).returns(true)
-      provider.expects(:deletecmd)
-      provider.expects(:run)
+      allow(provider).to receive(:exists?).and_return(true)
+      allow(provider).to receive(:is_role?).and_return(true)
+      expect(provider).to receive(:deletecmd)
+      expect(provider).to receive(:run)
       provider.destroy
     end
   end
 
   describe "#create_role" do
     it "should use the transition(role) if the user exists" do
-      provider.stubs(:exists?).returns(true)
-      provider.stubs(:is_role?).returns(false)
-      provider.expects(:transition).with("role")
-      provider.expects(:run)
+      allow(provider).to receive(:exists?).and_return(true)
+      allow(provider).to receive(:is_role?).and_return(false)
+      expect(provider).to receive(:transition).with("role")
+      expect(provider).to receive(:run)
       provider.create_role
     end
 
     it "should use the add command when role doesn't exists" do
-      provider.stubs(:exists?).returns(false)
-      provider.expects(:addcmd)
-      provider.expects(:run)
+      allow(provider).to receive(:exists?).and_return(false)
+      expect(provider).to receive(:addcmd)
+      expect(provider).to receive(:run)
       provider.create_role
     end
   end
 
   describe "with :allow_duplicates" do
     before do
-      resource.stubs(:allowdupe?).returns true
-      provider.stubs(:is_role?).returns(false)
-      provider.stubs(:execute)
-      resource.stubs(:system?).returns false
-      provider.expects(:execute).with { |args| args.include?("-o") }
+      allow(resource).to receive(:allowdupe?).and_return(true)
+      allow(provider).to receive(:is_role?).and_return(false)
+      allow(provider).to receive(:execute)
+      allow(resource).to receive(:system?).and_return(false)
+      expect(provider).to receive(:execute).with(include("-o"), any_args)
     end
 
     it "should add -o when the user is being created" do
-      provider.stubs(:password=)
+      allow(provider).to receive(:password=)
       provider.create
     end
 
@@ -137,14 +137,14 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
     context "#send" do
       describe "when getting #{val}" do
         it "should get the user_attributes" do
-          provider.expects(:user_attributes)
+          expect(provider).to receive(:user_attributes)
           provider.send(val)
         end
 
         it "should get the #{val} attribute" do
-          attributes = mock("attributes")
-          attributes.expects(:[]).with(val)
-          provider.stubs(:user_attributes).returns(attributes)
+          attributes = double("attributes")
+          expect(attributes).to receive(:[]).with(val)
+          allow(provider).to receive(:user_attributes).and_return(attributes)
           provider.send(val)
         end
       end
@@ -153,33 +153,33 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
 
   describe "#keys" do
     it "should get the user_attributes" do
-      provider.expects(:user_attributes)
+      expect(provider).to receive(:user_attributes)
       provider.keys
     end
 
     it "should call removed_managed_attributes" do
-      provider.stubs(:user_attributes).returns({ :type => "normal", :foo => "something" })
-      provider.expects(:remove_managed_attributes)
+      allow(provider).to receive(:user_attributes).and_return({ :type => "normal", :foo => "something" })
+      expect(provider).to receive(:remove_managed_attributes)
       provider.keys
     end
 
     it "should removed managed attribute (type, auths, roles, etc)" do
-      provider.stubs(:user_attributes).returns({ :type => "normal", :foo => "something" })
+      allow(provider).to receive(:user_attributes).and_return({ :type => "normal", :foo => "something" })
       expect(provider.keys).to eq({ :foo => "something" })
     end
   end
 
   describe "#add_properties" do
     it "should call build_keys_cmd" do
-      resource.stubs(:should).returns ""
-      resource.expects(:should).with(:keys).returns({ :foo => "bar" })
-      provider.expects(:build_keys_cmd).returns([])
+      allow(resource).to receive(:should).and_return("")
+      expect(resource).to receive(:should).with(:keys).and_return({ :foo => "bar" })
+      expect(provider).to receive(:build_keys_cmd).and_return([])
       provider.add_properties
     end
 
     it "should add the elements of the keys hash to an array" do
-      resource.stubs(:should).returns ""
-      resource.expects(:should).with(:keys).returns({ :foo => "bar"})
+      allow(resource).to receive(:should).and_return("")
+      expect(resource).to receive(:should).with(:keys).and_return({ :foo => "bar"})
       expect(provider.add_properties).to eq(["-K", "foo=bar"])
     end
   end
@@ -192,57 +192,57 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
 
   describe "#keys=" do
     before do
-      provider.stubs(:is_role?).returns(false)
+      allow(provider).to receive(:is_role?).and_return(false)
     end
 
     it "should run a command" do
-      provider.expects(:run)
+      expect(provider).to receive(:run)
       provider.keys=({})
     end
 
     it "should build the command" do
-      resource.stubs(:[]).with(:name).returns("someuser")
-      provider.stubs(:command).returns("usermod")
-      provider.expects(:build_keys_cmd).returns(["-K", "foo=bar"])
-      provider.expects(:run).with(["usermod", "-K", "foo=bar", "someuser"], "modify attribute key pairs")
+      allow(resource).to receive(:[]).with(:name).and_return("someuser")
+      allow(provider).to receive(:command).and_return("usermod")
+      expect(provider).to receive(:build_keys_cmd).and_return(["-K", "foo=bar"])
+      expect(provider).to receive(:run).with(["usermod", "-K", "foo=bar", "someuser"], "modify attribute key pairs")
       provider.keys=({})
     end
   end
 
   describe "#password" do
     before do
-      @array = mock "array"
+      @array = double("array")
     end
 
     it "should readlines of /etc/shadow" do
-      File.expects(:readlines).with("/etc/shadow").returns([])
+      expect(File).to receive(:readlines).with("/etc/shadow").and_return([])
       provider.password
     end
 
     it "should reject anything that doesn't start with alpha numerics" do
-      @array.expects(:reject).returns([])
-      File.stubs(:readlines).with("/etc/shadow").returns(@array)
+      expect(@array).to receive(:reject).and_return([])
+      allow(File).to receive(:readlines).with("/etc/shadow").and_return(@array)
       provider.password
     end
 
     it "should collect splitting on ':'" do
-      @array.stubs(:reject).returns(@array)
-      @array.expects(:collect).returns([])
-      File.stubs(:readlines).with("/etc/shadow").returns(@array)
+      allow(@array).to receive(:reject).and_return(@array)
+      expect(@array).to receive(:collect).and_return([])
+      allow(File).to receive(:readlines).with("/etc/shadow").and_return(@array)
       provider.password
     end
 
     it "should find the matching user" do
-      resource.stubs(:[]).with(:name).returns("username")
-      @array.stubs(:reject).returns(@array)
-      @array.stubs(:collect).returns([["username", "hashedpassword"], ["someoneelse", "theirpassword"]])
-      File.stubs(:readlines).with("/etc/shadow").returns(@array)
+      allow(resource).to receive(:[]).with(:name).and_return("username")
+      allow(@array).to receive(:reject).and_return(@array)
+      allow(@array).to receive(:collect).and_return([["username", "hashedpassword"], ["someoneelse", "theirpassword"]])
+      allow(File).to receive(:readlines).with("/etc/shadow").and_return(@array)
       expect(provider.password).to eq("hashedpassword")
     end
 
     it "should get the right password" do
-      resource.stubs(:[]).with(:name).returns("username")
-      File.stubs(:readlines).with("/etc/shadow").returns(["#comment", "   nonsense", "  ", "username:hashedpassword:stuff:foo:bar:::", "other:pword:yay:::"])
+      allow(resource).to receive(:[]).with(:name).and_return("username")
+      allow(File).to receive(:readlines).with("/etc/shadow").and_return(["#comment", "   nonsense", "  ", "username:hashedpassword:stuff:foo:bar:::", "other:pword:yay:::"])
       expect(provider.password).to eq("hashedpassword")
     end
   end
@@ -251,7 +251,7 @@ describe Puppet::Type.type(:user).provider(:user_role_add), :unless => Puppet.fe
     let(:path) { tmpfile('etc-shadow') }
 
     before :each do
-      provider.stubs(:target_file_path).returns(path)
+      allow(provider).to receive(:target_file_path).and_return(path)
     end
 
     def write_fixture(content)
@@ -267,7 +267,7 @@ FIXTURE
     end
 
     it "should only update the target user" do
-      Date.expects(:today).returns Date.new(2011,12,07)
+      expect(Date).to receive(:today).and_return(Date.new(2011,12,07))
       write_fixture <<FIXTURE
 before:seriously:15315:0:99999:7:::
 fakeval:seriously:15315:0:99999:7:::
@@ -297,7 +297,7 @@ FIXTURE
     end
 
     it "should update the lastchg field" do
-      Date.expects(:today).returns Date.new(2013,5,12) # 15837 days after 1970-01-01
+      expect(Date).to receive(:today).and_return(Date.new(2013,5,12)) # 15837 days after 1970-01-01
       write_fixture <<FIXTURE
 before:seriously:15315:0:99999:7:::
 fakeval:seriously:15629:0:99999:7:::
@@ -316,58 +316,58 @@ EOT
 
   describe "#shadow_entry" do
     it "should return the line for the right user" do
-      File.stubs(:readlines).returns(["someuser:!:10:5:20:7:1::\n", "fakeval:*:20:10:30:7:2::\n", "testuser:*:30:15:40:7:3::\n"])
+      allow(File).to receive(:readlines).and_return(["someuser:!:10:5:20:7:1::\n", "fakeval:*:20:10:30:7:2::\n", "testuser:*:30:15:40:7:3::\n"])
       expect(provider.shadow_entry).to eq(["fakeval", "*", "20", "10", "30", "7", "2", "", ""])
     end
   end
 
   describe "#password_max_age" do
     it "should return a maximum age number" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345:0:50::::\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345:0:50::::\n"])
       expect(provider.password_max_age).to eq("50")
     end
 
     it "should return -1 for no maximum" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345::::::\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345::::::\n"])
       expect(provider.password_max_age).to eq(-1)
     end
 
     it "should return -1 for no maximum when failed attempts are present" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345::::::3\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345::::::3\n"])
       expect(provider.password_max_age).to eq(-1)
     end
   end
 
   describe "#password_min_age" do
     it "should return a minimum age number" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345:10:50::::\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345:10:50::::\n"])
       expect(provider.password_min_age).to eq("10")
     end
 
     it "should return -1 for no minimum" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345::::::\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345::::::\n"])
       expect(provider.password_min_age).to eq(-1)
     end
 
     it "should return -1 for no minimum when failed attempts are present" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345::::::3\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345::::::3\n"])
       expect(provider.password_min_age).to eq(-1)
     end
   end
 
   describe "#password_warn_days" do
     it "should return a warn days number" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345:10:50:30:::\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345:10:50:30:::\n"])
       expect(provider.password_warn_days).to eq("30")
     end
 
     it "should return -1 for no warn days" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345::::::\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345::::::\n"])
       expect(provider.password_warn_days).to eq(-1)
     end
 
     it "should return -1 for no warn days when failed attempts are present" do
-      File.stubs(:readlines).returns(["fakeval:NP:12345::::::3\n"])
+      allow(File).to receive(:readlines).and_return(["fakeval:NP:12345::::::3\n"])
       expect(provider.password_warn_days).to eq(-1)
     end
   end

data/spec/unit/provider/user/useradd_spec.rb

@@ -1,17 +1,17 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-describe Puppet::Type.type(:user).provider(:useradd) do
+RSpec::Matchers.define_negated_matcher :excluding, :include
 
+describe Puppet::Type.type(:user).provider(:useradd) do
   before :each do
-    described_class.stubs(:command).with(:password).returns '/usr/bin/chage'
-    described_class.stubs(:command).with(:localpassword).returns '/usr/sbin/lchage'
-    described_class.stubs(:command).with(:add).returns '/usr/sbin/useradd'
-    described_class.stubs(:command).with(:localadd).returns '/usr/sbin/luseradd'
-    described_class.stubs(:command).with(:modify).returns '/usr/sbin/usermod'
-    described_class.stubs(:command).with(:localmodify).returns '/usr/sbin/lusermod'
-    described_class.stubs(:command).with(:delete).returns '/usr/sbin/userdel'
-    described_class.stubs(:command).with(:localdelete).returns '/usr/sbin/luserdel'
+    allow(described_class).to receive(:command).with(:password).and_return('/usr/bin/chage')
+    allow(described_class).to receive(:command).with(:localpassword).and_return('/usr/sbin/lchage')
+    allow(described_class).to receive(:command).with(:add).and_return('/usr/sbin/useradd')
+    allow(described_class).to receive(:command).with(:localadd).and_return('/usr/sbin/luseradd')
+    allow(described_class).to receive(:command).with(:modify).and_return('/usr/sbin/usermod')
+    allow(described_class).to receive(:command).with(:localmodify).and_return('/usr/sbin/lusermod')
+    allow(described_class).to receive(:command).with(:delete).and_return('/usr/sbin/userdel')
+    allow(described_class).to receive(:command).with(:localdelete).and_return('/usr/sbin/luserdel')
   end
 
   let(:resource) do
@@ -25,7 +25,6 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   let(:provider) { described_class.new(:name => 'myuser') }
 
-
   let(:shadow_entry) {
     return unless Puppet.features.libshadow?
     entry = Struct::PasswdEntry.new
@@ -41,37 +40,36 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   }
 
   describe "#create" do
-
     before do
-      provider.stubs(:exists?).returns(false)
+      allow(provider).to receive(:exists?).and_return(false)
     end
 
     it "should add -g when no gid is specified and group already exists" do
-      Puppet::Util.stubs(:gid).returns(true)
+      allow(Puppet::Util).to receive(:gid).and_return(true)
       resource[:ensure] = :present
-      provider.expects(:execute).with(includes('-g'), kind_of(Hash))
+      expect(provider).to receive(:execute).with(include('-g'), kind_of(Hash))
       provider.create
     end
 
     it "should use -G to set groups" do
-      Facter.stubs(:value).with(:osfamily).returns('Not RedHat')
+      allow(Facter).to receive(:value).with(:osfamily).and_return('Not RedHat')
       resource[:ensure] = :present
       resource[:groups] = ['group1', 'group2']
-      provider.expects(:execute).with(['/usr/sbin/useradd', '-G', 'group1,group2', 'myuser'], kind_of(Hash))
+      expect(provider).to receive(:execute).with(['/usr/sbin/useradd', '-G', 'group1,group2', 'myuser'], kind_of(Hash))
       provider.create
     end
 
     it "should use -G to set groups without -M on RedHat" do
-      Facter.stubs(:value).with(:osfamily).returns('RedHat')
+      allow(Facter).to receive(:value).with(:osfamily).and_return('RedHat')
       resource[:ensure] = :present
       resource[:groups] = ['group1', 'group2']
-      provider.expects(:execute).with(['/usr/sbin/useradd', '-G', 'group1,group2', '-M', 'myuser'], kind_of(Hash))
+      expect(provider).to receive(:execute).with(['/usr/sbin/useradd', '-G', 'group1,group2', '-M', 'myuser'], kind_of(Hash))
       provider.create
     end
 
     it "should add -o when allowdupe is enabled and the user is being created" do
       resource[:allowdupe] = true
-      provider.expects(:execute).with(includes('-o'), kind_of(Hash))
+      expect(provider).to receive(:execute).with(include('-o'), kind_of(Hash))
       provider.create
     end
 
@@ -79,7 +77,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       it "should add -r when system is enabled" do
         resource[:system] = :true
         expect(provider).to be_system_users
-        provider.expects(:execute).with(includes('-r'), kind_of(Hash))
+        expect(provider).to receive(:execute).with(include('-r'), kind_of(Hash))
         provider.create
       end
     end
@@ -88,7 +86,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       it "should not add -r when system is enabled" do
         resource[:system] = :true
         expect(provider).not_to be_system_users
-        provider.expects(:execute).with(['/usr/sbin/useradd', 'myuser'], kind_of(Hash))
+        expect(provider).to receive(:execute).with(['/usr/sbin/useradd', 'myuser'], kind_of(Hash))
         provider.create
       end
     end
@@ -98,8 +96,8 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       resource[:password_min_age] = 5
       resource[:password_max_age] = 10
       resource[:password_warn_days] = 15
-      provider.expects(:execute).with(includes('/usr/sbin/useradd'), kind_of(Hash))
-      provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+      expect(provider).to receive(:execute).with(include('/usr/sbin/useradd'), kind_of(Hash))
+      expect(provider).to receive(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], hash_including(failonfail: true, combine: true, custom_environment: {}))
       provider.create
     end
 
@@ -108,40 +106,41 @@ describe Puppet::Type.type(:user).provider(:useradd) do
          described_class.has_feature :libuser
          resource[:forcelocal] = true
       end
+
       it "should use luseradd instead of useradd" do
-        provider.expects(:execute).with(includes('/usr/sbin/luseradd'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/luseradd'), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.create
       end
 
       it "should NOT use -o when allowdupe=true" 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 UIDs" do
         resource[:uid] = 505
-        provider.stubs(:finduser).returns(true)
+        allow(provider).to receive(:finduser).and_return(true)
         expect { provider.create }.to raise_error(Puppet::Error, "UID 505 already exists, use allowdupe to force user creation")
       end
 
       it "should not use -G for luseradd and should call usermod with -G after luseradd when groups property is set" do
         resource[:groups] = ['group1', 'group2']
-        provider.expects(:execute).with(all_of(includes('/usr/sbin/luseradd'), Not(includes('-G'))), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(all_of(includes('/usr/sbin/usermod'), includes('-G')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/luseradd').and(excluding('-G')), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/usermod').and(include('-G')), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.create
       end
 
       it "should not use -m when managehome set" do
         resource[:managehome] = :true
-        provider.expects(:execute).with(Not(includes('-m')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(excluding('-m'), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.create
       end
 
       it "should not use -e with luseradd, should call usermod with -e after luseradd when expiry is set" do
         resource[:expiry] = '2038-01-24'
-        provider.expects(:execute).with(all_of(includes('/usr/sbin/luseradd'), Not(includes('-e'))), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(all_of(includes('/usr/sbin/usermod'), includes('-e')), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/luseradd').and(excluding('-e')), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/usermod').and(include('-e')), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.create
       end
 
@@ -150,8 +149,8 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         resource[:password_min_age] = 5
         resource[:password_max_age] = 10
         resource[:password_warn_days] = 15
-        provider.expects(:execute).with(includes('/usr/sbin/luseradd'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
-        provider.expects(:execute).with(['/usr/sbin/lchage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/luseradd'), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lchage', '-m', 5, '-M', 10, '-W', 15, 'myuser'], hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.create
       end
     end
@@ -159,12 +158,11 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     describe "on systems that allow to set shell" do
       it "should trigger shell validation" do
         resource[:shell] = '/bin/bash'
-        provider.expects(:check_valid_shell)
-        provider.expects(:execute).with(includes('-s'), kind_of(Hash))
+        expect(provider).to receive(:check_valid_shell)
+        expect(provider).to receive(:execute).with(include('-s'), kind_of(Hash))
         provider.create
       end
     end
-
   end
 
   describe '#modify' do
@@ -175,34 +173,34 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       end
 
       it "should use usermod" do
-        provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-u', 150, 'myuser'], hash_including(failonfail: true, combine: true, custom_environment: {}))
         provider.uid = 150
       end
 
       it "should use -o when allowdupe=true" do
         resource[:allowdupe] = :true
-        provider.expects(:execute).with(includes('-o'), has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(include('-o'), hash_including(failonfail: true, combine: true, custom_environment: {}))
         provider.uid = 505
       end
 
       it 'should use chage for password_min_age' do
-        provider.expects(:execute).with(['/usr/bin/chage', '-m', 100, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/bin/chage', '-m', 100, 'myuser'], hash_including(failonfail: true, combine: true, custom_environment: {}))
         provider.password_min_age = 100
       end
 
       it 'should use chage for password_max_age' do
-        provider.expects(:execute).with(['/usr/bin/chage', '-M', 101, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/bin/chage', '-M', 101, 'myuser'], hash_including(failonfail: true, combine: true, custom_environment: {}))
         provider.password_max_age = 101
       end
 
       it 'should use chage for password_warn_days' do
-        provider.expects(:execute).with(['/usr/bin/chage', '-W', 99, 'myuser'], has_entries({:failonfail => true, :combine => true, :custom_environment => {}}))
+        expect(provider).to receive(:execute).with(['/usr/bin/chage', '-W', 99, 'myuser'], hash_including(failonfail: true, combine: true, custom_environment: {}))
         provider.password_warn_days = 99
       end
 
       it 'should not call check_allow_dup if not modifying the uid' do
-        provider.expects(:check_allow_dup).never
-        provider.expects(:execute)
+        expect(provider).not_to receive(:check_allow_dup)
+        expect(provider).to receive(:execute)
         provider.home = 'foo/bar'
       end
     end
@@ -214,34 +212,34 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       end
 
       it "should use lusermod and not usermod" do
-        provider.expects(:execute).with(['/usr/sbin/lusermod', '-u', 150, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lusermod', '-u', 150, 'myuser'], hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.uid = 150
       end
 
       it "should NOT use -o when allowdupe=true" 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.uid = 505
       end
 
       it "should raise an exception for duplicate UIDs" do
         resource[:uid] = 505
-        provider.stubs(:finduser).returns(true)
+        allow(provider).to receive(:finduser).and_return(true)
         expect { provider.uid = 505 }.to raise_error(Puppet::Error, "UID 505 already exists, use allowdupe to force user creation")
       end
 
       it 'should use lchage for password_warn_days' do
-        provider.expects(:execute).with(['/usr/sbin/lchage', '-W', 99, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lchage', '-W', 99, 'myuser'], hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.password_warn_days = 99
       end
 
       it 'should use lchage for password_min_age' do
-        provider.expects(:execute).with(['/usr/sbin/lchage', '-m', 100, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lchage', '-m', 100, 'myuser'], hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.password_min_age = 100
       end
 
       it 'should use lchage for password_max_age' do
-        provider.expects(:execute).with(['/usr/sbin/lchage', '-M', 101, 'myuser'], has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(['/usr/sbin/lchage', '-M', 101, 'myuser'], hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.password_max_age = 101
       end
     end
@@ -250,35 +248,34 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   describe "#uid=" do
     it "should add -o when allowdupe is enabled and the uid is being modified" do
       resource[:allowdupe] = :true
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, '-o', 'myuser'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-u', 150, '-o', 'myuser'], hash_including(custom_environment: {}))
       provider.uid = 150
     end
   end
 
   describe "#expiry=" do
     it "should pass expiry to usermod as MM/DD/YY when on Solaris" do
-      Facter.expects(:value).with(:operatingsystem).returns 'Solaris'
+      expect(Facter).to receive(:value).with(:operatingsystem).and_return('Solaris')
       resource[:expiry] = '2012-10-31'
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '10/31/2012', 'myuser'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-e', '10/31/2012', 'myuser'], hash_including(custom_environment: {}))
       provider.expiry = '2012-10-31'
     end
 
     it "should pass expiry to usermod as YYYY-MM-DD when not on Solaris" do
-      Facter.expects(:value).with(:operatingsystem).returns 'not_solaris'
+      expect(Facter).to receive(:value).with(:operatingsystem).and_return('not_solaris')
       resource[:expiry] = '2012-10-31'
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '2012-10-31', 'myuser'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-e', '2012-10-31', 'myuser'], hash_including(custom_environment: {}))
       provider.expiry = '2012-10-31'
     end
 
     it "should use -e with an empty string when the expiry property is removed" do
       resource[:expiry] = :absent
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', '', 'myuser'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-e', '', 'myuser'], hash_including(custom_environment: {}))
       provider.expiry = :absent
     end
   end
 
   describe "#check_allow_dup" do
-
     it "should return an array with a flag if dup is allowed" do
       resource[:allowdupe] = :true
       expect(provider.check_allow_dup).to eq(["-o"])
@@ -292,25 +289,25 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   describe "#check_system_users" do
     it "should check system users" do
-      described_class.expects(:system_users?).returns true
-      resource.expects(:system?)
+      expect(described_class).to receive(:system_users?).and_return(true)
+      expect(resource).to receive(:system?)
       provider.check_system_users
     end
 
     it "should return an array with a flag if it's a system user" do
-      described_class.expects(:system_users?).returns true
+      expect(described_class).to receive(:system_users?).and_return(true)
       resource[:system] = :true
       expect(provider.check_system_users).to eq(["-r"])
     end
 
     it "should return an empty array if it's not a system user" do
-      described_class.expects(:system_users?).returns true
+      expect(described_class).to receive(:system_users?).and_return(true)
       resource[:system] = :false
       expect(provider.check_system_users).to eq([])
     end
 
     it "should return an empty array if system user is not featured" do
-      described_class.expects(:system_users?).returns false
+      expect(described_class).to receive(:system_users?).and_return(false)
       resource[:system] = :true
       expect(provider.check_system_users).to eq([])
     end
@@ -319,29 +316,29 @@ describe Puppet::Type.type(:user).provider(:useradd) do
   describe "#check_manage_home" do
     it "should return an array with -m flag if home is managed" do
       resource[:managehome] = :true
-      provider.expects(:execute).with(includes('-m'), has_entry(:custom_environment, {}))
+      expect(provider).to receive(:execute).with(include('-m'), hash_including(custom_environment: {}))
       provider.create
     end
 
     it "should return an array with -r flag if home is managed" do
       resource[:managehome] = :true
       resource[:ensure] = :absent
-      provider.stubs(:exists?).returns(true)
-      provider.expects(:execute).with(includes('-r'), has_entry(:custom_environment, {}))
+      allow(provider).to receive(:exists?).and_return(true)
+      expect(provider).to receive(:execute).with(include('-r'), hash_including(custom_environment: {}))
       provider.delete
     end
 
     it "should use -M flag if home is not managed and on Redhat" do
-      Facter.stubs(:value).with(:osfamily).returns("RedHat")
+      allow(Facter).to receive(:value).with(:osfamily).and_return("RedHat")
       resource[:managehome] = :false
-      provider.expects(:execute).with(includes('-M'), kind_of(Hash))
+      expect(provider).to receive(:execute).with(include('-M'), kind_of(Hash))
       provider.create
     end
 
     it "should not use -M flag if home is not managed and not on Redhat" do
-      Facter.stubs(:value).with(:osfamily).returns("not RedHat")
+      allow(Facter).to receive(:value).with(:osfamily).and_return("not RedHat")
       resource[:managehome] = :false
-      provider.expects(:execute).with(Not(includes('-M')), kind_of(Hash))
+      expect(provider).to receive(:execute).with(excluding('-M'), kind_of(Hash))
       provider.create
     end
   end
@@ -355,22 +352,22 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
 
     it "should call command with :add" do
-      provider.expects(:command).with(:add)
+      expect(provider).to receive(:command).with(:add)
       provider.addcmd
     end
 
     it "should add properties" do
-      provider.expects(:add_properties).returns(['-foo_add_properties'])
+      expect(provider).to receive(:add_properties).and_return(['-foo_add_properties'])
       expect(provider.addcmd).to include '-foo_add_properties'
     end
 
     it "should check and add if dup allowed" do
-      provider.expects(:check_allow_dup).returns(['-allow_dup_flag'])
+      expect(provider).to receive(:check_allow_dup).and_return(['-allow_dup_flag'])
       expect(provider.addcmd).to include '-allow_dup_flag'
     end
 
     it "should check and add if home is managed" do
-      provider.expects(:check_manage_home).returns(['-manage_home_flag'])
+      expect(provider).to receive(:check_manage_home).and_return(['-manage_home_flag'])
       expect(provider.addcmd).to include '-manage_home_flag'
     end
 
@@ -400,26 +397,26 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
 
     it "should return an array with the full command and expiry as MM/DD/YY when on Solaris" do
-      Facter.stubs(:value).with(:operatingsystem).returns 'Solaris'
-      described_class.expects(:system_users?).returns true
+      allow(Facter).to receive(:value).with(:operatingsystem).and_return('Solaris')
+      expect(described_class).to receive(:system_users?).and_return(true)
       resource[:expiry] = "2012-08-18"
       expect(provider.addcmd).to eq(['/usr/sbin/useradd', '-e', '08/18/2012', '-G', 'somegroup', '-o', '-m', '-r', 'myuser'])
     end
 
     it "should return an array with the full command and expiry as YYYY-MM-DD when not on Solaris" do
-      Facter.stubs(:value).with(:operatingsystem).returns 'not_solaris'
-      described_class.expects(:system_users?).returns true
+      allow(Facter).to receive(:value).with(:operatingsystem).and_return('not_solaris')
+      expect(described_class).to receive(:system_users?).and_return(true)
       resource[:expiry] = "2012-08-18"
       expect(provider.addcmd).to eq(['/usr/sbin/useradd', '-e', '2012-08-18', '-G', 'somegroup', '-o', '-m', '-r', 'myuser'])
     end
 
     it "should return an array without -e if expiry is undefined full command" do
-      described_class.expects(:system_users?).returns true
+      expect(described_class).to receive(:system_users?).and_return(true)
       expect(provider.addcmd).to eq(["/usr/sbin/useradd", "-G", "somegroup", "-o", "-m", "-r", "myuser"])
     end
 
     it "should pass -e \"\" if the expiry has to be removed" do
-      described_class.expects(:system_users?).returns true
+      expect(described_class).to receive(:system_users?).and_return(true)
       resource[:expiry] = :absent
 
       expect(provider.addcmd).to eq(['/usr/sbin/useradd', '-e', '', '-G', 'somegroup', '-o', '-m', '-r', 'myuser'])
@@ -471,18 +468,18 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       end
 
       it "should return absent if libshadow feature is not present" do
-        Puppet.features.stubs(:libshadow?).returns false
+        allow(Puppet.features).to receive(:libshadow?).and_return(false)
         # Shadow::Passwd.expects(:getspnam).never # if we really don't have libshadow we dont have Shadow::Passwd either
         expect(provider.send(property)).to eq(:absent)
       end
 
       it "should return absent if user cannot be found", :if => Puppet.features.libshadow? do
-        Shadow::Passwd.expects(:getspnam).with('myuser').returns nil
+        expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(nil)
         expect(provider.send(property)).to eq(:absent)
       end
 
       it "should return the correct value if libshadow is present", :if => Puppet.features.libshadow? do
-        Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+        expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(shadow_entry)
         expect(provider.send(property)).to eq(expected_value)
       end
 
@@ -495,7 +492,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
         canonical_name = [253, 241].pack('C*').force_encoding(Encoding::EUC_KR)
         provider = described_class.new(:name => '??', :canonical_name => canonical_name)
 
-        Shadow::Passwd.expects(:getspnam).with(canonical_name).returns shadow_entry
+        expect(Shadow::Passwd).to receive(:getspnam).with(canonical_name).and_return(shadow_entry)
         provider.password
       end
     end
@@ -507,23 +504,23 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
 
     it "should return absent if libshadow feature is not present" do
-      Puppet.features.stubs(:libshadow?).returns false
+      allow(Puppet.features).to receive(:libshadow?).and_return(false)
       expect(provider.expiry).to eq(:absent)
     end
 
     it "should return absent if user cannot be found", :if => Puppet.features.libshadow? do
-      Shadow::Passwd.expects(:getspnam).with('myuser').returns nil
+      expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(nil)
       expect(provider.expiry).to eq(:absent)
     end
 
     it "should return absent if expiry is -1", :if => Puppet.features.libshadow? do
       shadow_entry.sp_expire = -1
-      Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+      expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(shadow_entry)
       expect(provider.expiry).to eq(:absent)
     end
 
     it "should convert to YYYY-MM-DD", :if => Puppet.features.libshadow? do
-      Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+      expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(shadow_entry)
       expect(provider.expiry).to eq('2013-01-01')
     end
   end
@@ -540,7 +537,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
       # command(:password) is only called inside passcmd if
       # password_min_age or password_max_age is set
       resource[:password_min_age] = 123
-      provider.expects(:command).with(:password)
+      expect(provider).to receive(:command).with(:password)
       provider.passcmd
     end
 
@@ -597,7 +594,7 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     end
 
     it "should raise an error if the shell is not executable" do
-      FileTest.stubs(:executable?).with('LICENSE').returns false
+      allow(FileTest).to receive(:executable?).with('LICENSE').and_return(false)
       resource[:shell] = 'LICENSE'
       expect { provider.check_valid_shell }.to raise_error(Puppet::Error, /Shell LICENSE must be executable/)
     end
@@ -605,26 +602,30 @@ describe Puppet::Type.type(:user).provider(:useradd) do
 
   describe "#delete" do
     before do
-       provider.stubs(:exists?).returns(true)
+       allow(provider).to receive(:exists?).and_return(true)
        resource[:ensure] = :absent
     end
+
     describe "on systems with the libuser and forcelocal=false" do
       before do
          described_class.has_feature :libuser
          resource[:forcelocal] = false
       end
+
       it "should use userdel to delete users" do
-        provider.expects(:execute).with(includes('/usr/sbin/userdel'), has_entry(:custom_environment, {}))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/userdel'), hash_including(custom_environment: {}))
         provider.delete
       end
     end
+
     describe "on systems with the libuser and forcelocal=true" do
       before do
          described_class.has_feature :libuser
          resource[:forcelocal] = true
       end
+
       it "should use luserdel to delete users" do
-        provider.expects(:execute).with(includes('/usr/sbin/luserdel'), has_entry(:custom_environment, has_key('LIBUSER_CONF')))
+        expect(provider).to receive(:execute).with(include('/usr/sbin/luserdel'), hash_including(custom_environment: hash_including('LIBUSER_CONF')))
         provider.delete
       end
     end