puppet 5.3.4 → 6.29.0

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

@@ -1,10 +1,8 @@
-#!/usr/bin/env ruby
 require 'spec_helper'
 require 'etc'
 
-provider_class = Puppet::Type.type(:user).provider(:hpuxuseradd)
-
-describe provider_class, :unless => Puppet.features.microsoft_windows? do
+describe Puppet::Type.type(:user).provider(:hpuxuseradd),
+         unless: Puppet::Util::Platform.windows? do
   let :resource do
     Puppet::Type.type(:user).new(
       :title => 'testuser',
@@ -15,14 +13,15 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
   let(:provider) { resource.provider }
 
   it "should add -F when modifying a user" do
-    resource.stubs(:allowdupe?).returns true
-    provider.expects(:execute).with { |args| args.include?("-F") }
+    allow(resource).to receive(:allowdupe?).and_return(true)
+    allow(provider).to receive(:trusted).and_return(true)
+    expect(provider).to receive(:execute).with(include("-F"), anything)
     provider.uid = 1000
   end
 
   it "should add -F when deleting a user" do
-    provider.stubs(:exists?).returns(true)
-    provider.expects(:execute).with { |args| args.include?("-F") }
+    allow(provider).to receive(:exists?).and_return(true)
+    expect(provider).to receive(:execute).with(include("-F"), anything)
     provider.delete
   end
 
@@ -32,17 +31,17 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
 
     before :each do
-      Etc.stubs(:getpwent).returns(pwent)
-      Etc.stubs(:getpwnam).returns(pwent)
-      resource.stubs(:command).with(:modify).returns '/usr/sam/lbin/usermod.sam'
+      allow(Etc).to receive(:getpwent).and_return(pwent)
+      allow(Etc).to receive(:getpwnam).and_return(pwent)
+      allow(provider).to receive(:command).with(:modify).and_return('/usr/sam/lbin/usermod.sam')
     end
 
     it "should have feature manages_passwords" do
-      expect(provider_class).to be_manages_passwords
+      expect(described_class).to be_manages_passwords
     end
 
     it "should return nil if user does not exist" do
-      Etc.stubs(:getpwent).returns(nil)
+      allow(Etc).to receive(:getpwent).and_return(nil)
       expect(provider.password).to be_nil
     end
 
@@ -53,20 +52,20 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
 
   context "check for trusted computing" do
     before :each do
-      provider.stubs(:command).with(:modify).returns '/usr/sam/lbin/usermod.sam'
+      allow(provider).to receive(:command).with(:modify).and_return('/usr/sam/lbin/usermod.sam')
     end
 
     it "should add modprpw to modifycmd if Trusted System" do
-      resource.stubs(:allowdupe?).returns true
-      provider.expects(:exec_getprpw).with('root','-m uid').returns('uid=0')
-      provider.expects(:execute).with(['/usr/sam/lbin/usermod.sam', '-u', 1000, '-o', 'testuser', '-F', ';', '/usr/lbin/modprpw', '-v', '-l', 'testuser'])
+      allow(resource).to receive(:allowdupe?).and_return(true)
+      expect(provider).to receive(:exec_getprpw).with('root','-m uid').and_return('uid=0')
+      expect(provider).to receive(:execute).with(['/usr/sam/lbin/usermod.sam', '-F', '-u', 1000, '-o', 'testuser', ';', '/usr/lbin/modprpw', '-v', '-l', 'testuser'], hash_including(custom_environment: {}))
       provider.uid = 1000
     end
 
     it "should not add modprpw if not Trusted System" do
-      resource.stubs(:allowdupe?).returns true
-      provider.expects(:exec_getprpw).with('root','-m uid').returns('System is not trusted')
-      provider.expects(:execute).with(['/usr/sam/lbin/usermod.sam', '-u', 1000, '-o', 'testuser', '-F'])
+      allow(resource).to receive(:allowdupe?).and_return(true)
+      expect(provider).to receive(:exec_getprpw).with('root','-m uid').and_return('System is not trusted')
+      expect(provider).to receive(:execute).with(['/usr/sam/lbin/usermod.sam', '-F', '-u', 1000, '-o', 'testuser'], hash_including(custom_environment: {}))
       provider.uid = 1000
     end
   end

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

@@ -1,27 +1,24 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:user).provider(:ldap)
-
-describe provider_class do
+describe Puppet::Type.type(:user).provider(:ldap) do
   it "should have the Ldap provider class as its baseclass" do
-    expect(provider_class.superclass).to equal(Puppet::Provider::Ldap)
+    expect(described_class.superclass).to equal(Puppet::Provider::Ldap)
   end
 
   it "should manage :posixAccount and :person objectclasses" do
-    expect(provider_class.manager.objectclasses).to eq([:posixAccount, :person])
+    expect(described_class.manager.objectclasses).to eq([:posixAccount, :person])
   end
 
   it "should use 'ou=People' as its relative base" do
-    expect(provider_class.manager.location).to eq("ou=People")
+    expect(described_class.manager.location).to eq("ou=People")
   end
 
   it "should use :uid as its rdn" do
-    expect(provider_class.manager.rdn).to eq(:uid)
+    expect(described_class.manager.rdn).to eq(:uid)
   end
 
   it "should be able to manage passwords" do
-    expect(provider_class).to be_manages_passwords
+    expect(described_class).to be_manages_passwords
   end
 
   {:name => "uid",
@@ -33,80 +30,80 @@ describe provider_class do
     :shell => "loginShell"
   }.each do |puppet, ldap|
     it "should map :#{puppet.to_s} to '#{ldap}'" do
-      expect(provider_class.manager.ldap_name(puppet)).to eq(ldap)
+      expect(described_class.manager.ldap_name(puppet)).to eq(ldap)
     end
   end
 
-  describe "when being created" do
+  context "when being created" do
     before do
       # So we don't try to actually talk to ldap
-      @connection = mock 'connection'
-      provider_class.manager.stubs(:connect).yields @connection
+      @connection = double('connection')
+      allow(described_class.manager).to receive(:connect).and_yield(@connection)
     end
 
     it "should generate the sn as the last field of the cn" do
-      Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
+      expect(Puppet::Type.type(:group).provider(:ldap)).to receive(:name2id).with(["whatever"]).and_return([123])
 
-      resource = stub 'resource', :should => %w{whatever}
-      resource.stubs(:should).with(:comment).returns ["Luke Kanies"]
-      resource.stubs(:should).with(:ensure).returns :present
-      instance = provider_class.new(:name => "luke", :ensure => :absent)
+      resource = double('resource', :should => %w{whatever})
+      allow(resource).to receive(:should).with(:comment).and_return(["Luke Kanies"])
+      allow(resource).to receive(:should).with(:ensure).and_return(:present)
+      instance = described_class.new(:name => "luke", :ensure => :absent)
 
-      instance.stubs(:resource).returns resource
+      allow(instance).to receive(:resource).and_return(resource)
 
-      @connection.expects(:add).with { |dn, attrs| attrs["sn"] == ["Kanies"] }
+      expect(@connection).to receive(:add).with(anything, hash_including("sn" => ["Kanies"]))
 
       instance.create
       instance.flush
     end
 
     it "should translate a group name to the numeric id" do
-      Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with("bar").returns 101
+      expect(Puppet::Type.type(:group).provider(:ldap)).to receive(:name2id).with("bar").and_return(101)
 
-      resource = stub 'resource', :should => %w{whatever}
-      resource.stubs(:should).with(:gid).returns 'bar'
-      resource.stubs(:should).with(:ensure).returns :present
-      instance = provider_class.new(:name => "luke", :ensure => :absent)
-      instance.stubs(:resource).returns resource
+      resource = double('resource', :should => %w{whatever})
+      allow(resource).to receive(:should).with(:gid).and_return('bar')
+      allow(resource).to receive(:should).with(:ensure).and_return(:present)
+      instance = described_class.new(:name => "luke", :ensure => :absent)
+      allow(instance).to receive(:resource).and_return(resource)
 
-      @connection.expects(:add).with { |dn, attrs| attrs["gidNumber"] == ["101"] }
+      expect(@connection).to receive(:add).with(anything, hash_including("gidNumber" => ["101"]))
 
       instance.create
       instance.flush
     end
 
-    describe "with no uid specified" do
+    context "with no uid specified" do
       it "should pick the first available UID after the largest existing UID" do
-        Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
+        expect(Puppet::Type.type(:group).provider(:ldap)).to receive(:name2id).with(["whatever"]).and_return([123])
 
         low = {:name=>["luke"], :shell=>:absent, :uid=>["600"], :home=>["/h"], :gid=>["1000"], :password=>["blah"], :comment=>["l k"]}
         high = {:name=>["testing"], :shell=>:absent, :uid=>["640"], :home=>["/h"], :gid=>["1000"], :password=>["blah"], :comment=>["t u"]}
-        provider_class.manager.expects(:search).returns([low, high])
+        expect(described_class.manager).to receive(:search).and_return([low, high])
 
-        resource = stub 'resource', :should => %w{whatever}
-        resource.stubs(:should).with(:uid).returns nil
-        resource.stubs(:should).with(:ensure).returns :present
-        instance = provider_class.new(:name => "luke", :ensure => :absent)
-        instance.stubs(:resource).returns resource
+        resource = double('resource', :should => %w{whatever})
+        allow(resource).to receive(:should).with(:uid).and_return(nil)
+        allow(resource).to receive(:should).with(:ensure).and_return(:present)
+        instance = described_class.new(:name => "luke", :ensure => :absent)
+        allow(instance).to receive(:resource).and_return(resource)
 
-        @connection.expects(:add).with { |dn, attrs| attrs["uidNumber"] == ["641"] }
+        expect(@connection).to receive(:add).with(anything, hash_including("uidNumber" => ["641"]))
 
         instance.create
         instance.flush
       end
 
       it "should pick 501 of no users exist" do
-        Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
+        expect(Puppet::Type.type(:group).provider(:ldap)).to receive(:name2id).with(["whatever"]).and_return([123])
 
-        provider_class.manager.expects(:search).returns nil
+        expect(described_class.manager).to receive(:search).and_return(nil)
 
-        resource = stub 'resource', :should => %w{whatever}
-        resource.stubs(:should).with(:uid).returns nil
-        resource.stubs(:should).with(:ensure).returns :present
-        instance = provider_class.new(:name => "luke", :ensure => :absent)
-        instance.stubs(:resource).returns resource
+        resource = double('resource', :should => %w{whatever})
+        allow(resource).to receive(:should).with(:uid).and_return(nil)
+        allow(resource).to receive(:should).with(:ensure).and_return(:present)
+        instance = described_class.new(:name => "luke", :ensure => :absent)
+        allow(instance).to receive(:resource).and_return(resource)
 
-        @connection.expects(:add).with { |dn, attrs| attrs["uidNumber"] == ["501"] }
+        expect(@connection).to receive(:add).with(anything, hash_including("uidNumber" => ["501"]))
 
         instance.create
         instance.flush
@@ -114,21 +111,21 @@ describe provider_class do
     end
   end
 
-  describe "when flushing" do
+  context "when flushing" do
     before do
-      provider_class.stubs(:suitable?).returns true
+      allow(described_class).to receive(:suitable?).and_return(true)
 
-      @instance = provider_class.new(:name => "myname", :groups => %w{whatever}, :uid => "400")
+      @instance = described_class.new(:name => "myname", :groups => %w{whatever}, :uid => "400")
     end
 
     it "should remove the :groups value before updating" do
-      @instance.class.manager.expects(:update).with { |name, ldap, puppet| puppet[:groups].nil? }
+      expect(@instance.class.manager).to receive(:update).with(anything, anything, hash_excluding(:groups))
 
       @instance.flush
     end
 
     it "should empty the property hash" do
-      @instance.class.manager.stubs(:update)
+      allow(@instance.class.manager).to receive(:update)
 
       @instance.flush
 
@@ -136,7 +133,7 @@ describe provider_class do
     end
 
     it "should empty the ldap property hash" do
-      @instance.class.manager.stubs(:update)
+      allow(@instance.class.manager).to receive(:update)
 
       @instance.flush
 
@@ -144,109 +141,109 @@ describe provider_class do
     end
   end
 
-  describe "when checking group membership" do
+  context "when checking group membership" do
     before do
       @groups = Puppet::Type.type(:group).provider(:ldap)
       @group_manager = @groups.manager
-      provider_class.stubs(:suitable?).returns true
+      allow(described_class).to receive(:suitable?).and_return(true)
 
-      @instance = provider_class.new(:name => "myname")
+      @instance = described_class.new(:name => "myname")
     end
 
     it "should show its group membership as the sorted list of all groups returned by an ldap query of group memberships" do
       one = {:name => "one"}
       two = {:name => "two"}
-      @group_manager.expects(:search).with("memberUid=myname").returns([two, one])
+      expect(@group_manager).to receive(:search).with("memberUid=myname").and_return([two, one])
 
       expect(@instance.groups).to eq("one,two")
     end
 
     it "should show its group membership as :absent if no matching groups are found in ldap" do
-      @group_manager.expects(:search).with("memberUid=myname").returns(nil)
+      expect(@group_manager).to receive(:search).with("memberUid=myname").and_return(nil)
 
       expect(@instance.groups).to eq(:absent)
     end
 
     it "should cache the group value" do
-      @group_manager.expects(:search).with("memberUid=myname").once.returns nil
+      expect(@group_manager).to receive(:search).with("memberUid=myname").once.and_return(nil)
 
       @instance.groups
       expect(@instance.groups).to eq(:absent)
     end
   end
 
-  describe "when modifying group membership" do
+  context "when modifying group membership" do
     before do
       @groups = Puppet::Type.type(:group).provider(:ldap)
       @group_manager = @groups.manager
-      provider_class.stubs(:suitable?).returns true
+      allow(described_class).to receive(:suitable?).and_return(true)
 
       @one = {:name => "one", :gid => "500"}
-      @group_manager.stubs(:find).with("one").returns(@one)
+      allow(@group_manager).to receive(:find).with("one").and_return(@one)
 
       @two = {:name => "one", :gid => "600"}
-      @group_manager.stubs(:find).with("two").returns(@two)
+      allow(@group_manager).to receive(:find).with("two").and_return(@two)
 
-      @instance = provider_class.new(:name => "myname")
+      @instance = described_class.new(:name => "myname")
 
-      @instance.stubs(:groups).returns :absent
+      allow(@instance).to receive(:groups).and_return(:absent)
     end
 
     it "should fail if the group does not exist" do
-      @group_manager.expects(:find).with("mygroup").returns nil
+      expect(@group_manager).to receive(:find).with("mygroup").and_return(nil)
 
       expect { @instance.groups = "mygroup" }.to raise_error(Puppet::Error)
     end
 
     it "should only pass the attributes it cares about to the group manager" do
-      @group_manager.expects(:update).with { |name, attrs| attrs[:gid].nil? }
+      expect(@group_manager).to receive(:update).with(anything, hash_excluding(:gid), anything)
 
       @instance.groups = "one"
     end
 
     it "should always include :ensure => :present in the current values" do
-      @group_manager.expects(:update).with { |name, is, should| is[:ensure] == :present }
+      expect(@group_manager).to receive(:update).with(anything, hash_including(ensure: :present), anything)
 
       @instance.groups = "one"
     end
 
     it "should always include :ensure => :present in the desired values" do
-      @group_manager.expects(:update).with { |name, is, should| should[:ensure] == :present }
+      expect(@group_manager).to receive(:update).with(anything, anything, hash_including(ensure: :present))
 
       @instance.groups = "one"
     end
 
     it "should always pass the group's original member list" do
       @one[:members] = %w{yay ness}
-      @group_manager.expects(:update).with { |name, is, should| is[:members] == %w{yay ness} }
+      expect(@group_manager).to receive(:update).with(anything, hash_including(members: %w{yay ness}), anything)
 
       @instance.groups = "one"
     end
 
     it "should find the group again when resetting its member list, so it has the full member list" do
-      @group_manager.expects(:find).with("one").returns(@one)
+      expect(@group_manager).to receive(:find).with("one").and_return(@one)
 
-      @group_manager.stubs(:update)
+      allow(@group_manager).to receive(:update)
 
       @instance.groups = "one"
     end
 
-    describe "for groups that have no members" do
+    context "for groups that have no members" do
       it "should create a new members attribute with its value being the user's name" do
-        @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{myname} }
+        expect(@group_manager).to receive(:update).with(anything, anything, hash_including(members: %w{myname}))
 
         @instance.groups = "one"
       end
     end
 
-    describe "for groups it is being removed from" do
+    context "for groups it is being removed from" do
       it "should replace the group's member list with one missing the user's name" do
         @one[:members] = %w{myname a}
         @two[:members] = %w{myname b}
 
-        @group_manager.expects(:update).with { |name, is, should| name == "two" and should[:members] == %w{b} }
+        expect(@group_manager).to receive(:update).with("two", anything, hash_including(members: %w{b}))
 
-        @instance.stubs(:groups).returns "one,two"
+        allow(@instance).to receive(:groups).and_return("one,two")
         @instance.groups = "one"
       end
 
@@ -254,33 +251,33 @@ describe provider_class do
         @one[:members] = %w{myname}
         @two[:members] = %w{myname b}
 
-        @group_manager.expects(:update).with { |name, is, should| name == "one" and should[:members] == :absent }
+        expect(@group_manager).to receive(:update).with("one", anything, hash_including(members: :absent))
 
-        @instance.stubs(:groups).returns "one,two"
+        allow(@instance).to receive(:groups).and_return("one,two")
         @instance.groups = "two"
       end
     end
 
-    describe "for groups that already have members" do
+    context "for groups that already have members" do
       it "should replace each group's member list with a new list including the user's name" do
         @one[:members] = %w{a b}
-        @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{a b myname} }
+        expect(@group_manager).to receive(:update).with(anything, anything, hash_including(members: %w{a b myname}))
         @two[:members] = %w{b c}
-        @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{b c myname} }
+        expect(@group_manager).to receive(:update).with(anything, anything, hash_including(members: %w{b c myname}))
 
         @instance.groups = "one,two"
       end
     end
 
-    describe "for groups of which it is a member" do
+    context "for groups of which it is a member" do
       it "should do nothing" do
         @one[:members] = %w{a b}
-        @group_manager.expects(:update).with { |name, is, should| should[:members] == %w{a b myname} }
+        expect(@group_manager).to receive(:update).with(anything, anything, hash_including(members: %w{a b myname}))
 
         @two[:members] = %w{c myname}
-        @group_manager.expects(:update).with { |name, *other| name == "two" }.never
+        expect(@group_manager).not_to receive(:update).with("two", any_args)
 
-        @instance.stubs(:groups).returns "two"
+        allow(@instance).to receive(:groups).and_return("two")
 
         @instance.groups = "one,two"
       end

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

@@ -1,13 +1,11 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:user).provider(:openbsd) do
-
   before :each do
-    described_class.stubs(:command).with(:password).returns '/usr/sbin/passwd'
-    described_class.stubs(:command).with(:add).returns '/usr/sbin/useradd'
-    described_class.stubs(:command).with(:modify).returns '/usr/sbin/usermod'
-    described_class.stubs(:command).with(:delete).returns '/usr/sbin/userdel'
+    allow(described_class).to receive(:command).with(:password).and_return('/usr/sbin/passwd')
+    allow(described_class).to receive(:command).with(:add).and_return('/usr/sbin/useradd')
+    allow(described_class).to receive(:command).with(:modify).and_return('/usr/sbin/usermod')
+    allow(described_class).to receive(:command).with(:delete).and_return('/usr/sbin/userdel')
   end
 
   let(:resource) do
@@ -33,20 +31,21 @@ describe Puppet::Type.type(:user).provider(:openbsd) do
   describe "#expiry=" do
     it "should pass expiry to usermod as MM/DD/YY" do
       resource[:expiry] = '2014-11-05'
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-e', 'November 05 2014', 'myuser'])
+      expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-e', 'November 05 2014', 'myuser'], hash_including(custom_environment: {}))
       provider.expiry = '2014-11-05'
     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'])
+      expect(provider).to receive(:execute).with(['/usr/sbin/usermod', '-e', '', 'myuser'], hash_including(custom_environment: {}))
       provider.expiry = :absent
     end
   end
 
   describe "#addcmd" do
     it "should return an array with the full command and expiry as MM/DD/YY" do
-      Facter.stubs(:value).with(:osfamily).returns('OpenBSD')
+      allow(Facter).to receive(:value).with(:osfamily).and_return('OpenBSD')
+      allow(Facter).to receive(:value).with(:operatingsystemmajrelease)
       resource[:expiry] = "1997-06-01"
       expect(provider.addcmd).to eq(['/usr/sbin/useradd', '-e', 'June 01 1997', 'myuser'])
     end
@@ -58,19 +57,19 @@ describe Puppet::Type.type(:user).provider(:openbsd) do
     end
 
     it "should return the loginclass if set", :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)
       provider.send(:loginclass).should == 'staff'
     end
 
     it "should return the empty string when loginclass isn't set", :if => Puppet.features.libshadow? do
       shadow_entry[:sp_loginclass] = ''
-      Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+      expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(shadow_entry)
       provider.send(:loginclass).should == ''
     end
 
     it "should return nil when loginclass isn't available", :if => Puppet.features.libshadow? do
       shadow_entry[:sp_loginclass] = nil
-      Shadow::Passwd.expects(:getspnam).with('myuser').returns shadow_entry
+      expect(Shadow::Passwd).to receive(:getspnam).with('myuser').and_return(shadow_entry)
       provider.send(:loginclass).should be_nil
     end
   end