puppet 5.5.12-universal-darwin → 5.5.13-universal-darwin

data/spec/unit/util/splayer_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/splayer'
 
@@ -14,31 +13,31 @@ describe Puppet::Util::Splayer do
 
   it "should do nothing if splay is disabled" do
     Puppet[:splay] = false
-    subject.expects(:sleep).never
+    expect(subject).not_to receive(:sleep)
     subject.splay
   end
 
   it "should do nothing if it has already splayed" do
-    subject.expects(:splayed?).returns true
-    subject.expects(:sleep).never
+    expect(subject).to receive(:splayed?).and_return(true)
+    expect(subject).not_to receive(:sleep)
     subject.splay
   end
 
   it "should log that it is splaying" do
-    subject.stubs :sleep
-    Puppet.expects :info
+    allow(subject).to receive(:sleep)
+    expect(Puppet).to receive(:info)
     subject.splay
   end
 
   it "should sleep for a random portion of the splaylimit plus 1" do
     Puppet[:splaylimit] = "50"
-    subject.expects(:rand).with(51).returns 10
-    subject.expects(:sleep).with(10)
+    expect(subject).to receive(:rand).with(51).and_return(10)
+    expect(subject).to receive(:sleep).with(10)
     subject.splay
   end
 
   it "should mark that it has splayed" do
-    subject.stubs(:sleep)
+    allow(subject).to receive(:sleep)
     subject.splay
     expect(subject).to be_splayed
   end

data/spec/unit/util/ssl_spec.rb

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

data/spec/unit/util/storage_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'yaml'
@@ -68,7 +67,7 @@ describe Puppet::Util::Storage do
 
   describe "when loading from the state file" do
     before do
-      Puppet.settings.stubs(:use).returns(true)
+      allow(Puppet.settings).to receive(:use).and_return(true)
     end
 
     describe "when the state file/directory does not exist" do
@@ -146,7 +145,7 @@ describe Puppet::Util::Storage do
       it "should raise an error if the state file does not contain valid YAML and cannot be renamed" do
         write_state_file('{ invalid')
 
-        File.expects(:rename).raises(SystemCallError)
+        expect(File).to receive(:rename).and_raise(SystemCallError)
 
         expect { Puppet::Util::Storage.load }.to raise_error(Puppet::Error, /Could not rename/)
       end
@@ -154,7 +153,7 @@ describe Puppet::Util::Storage do
       it "should attempt to rename the state file if the file is corrupted" do
         write_state_file('{ invalid')
 
-        File.expects(:rename).at_least_once
+        expect(File).to receive(:rename).at_least(:once)
 
         Puppet::Util::Storage.load
       end

data/spec/unit/util/suidmanager_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 
 describe Puppet::Util::SUIDManager do
@@ -12,18 +10,18 @@ describe Puppet::Util::SUIDManager do
   end
 
   before :each do
-    Puppet::Util::SUIDManager.stubs(:convert_xid).returns(42)
-    pwent = stub('pwent', :name => 'fred', :uid => 42, :gid => 42)
-    Etc.stubs(:getpwuid).with(42).returns(pwent)
+    allow(Puppet::Util::SUIDManager).to receive(:convert_xid).and_return(42)
+    pwent = double('pwent', :name => 'fred', :uid => 42, :gid => 42)
+    allow(Etc).to receive(:getpwuid).with(42).and_return(pwent)
 
     [:euid, :egid, :uid, :gid, :groups].each do |id|
-      Process.stubs("#{id}=").with {|value| xids[id] = value }
+      allow(Process).to receive("#{id}=") {|value| xids[id] = value}
     end
   end
 
   describe "#initgroups" do
     it "should use the primary group of the user as the 'basegid'" do
-      Process.expects(:initgroups).with('fred', 42)
+      expect(Process).to receive(:initgroups).with('fred', 42)
       described_class.initgroups(42)
     end
   end
@@ -40,11 +38,11 @@ describe Puppet::Util::SUIDManager do
 
   describe "#asuser" do
     it "should not get or set euid/egid when not root" do
-      Puppet.features.stubs(:microsoft_windows?).returns(false)
-      Process.stubs(:uid).returns(1)
+      allow(Puppet.features).to receive(:microsoft_windows?).and_return(false)
+      allow(Process).to receive(:uid).and_return(1)
 
-      Process.stubs(:egid).returns(51)
-      Process.stubs(:euid).returns(50)
+      allow(Process).to receive(:egid).and_return(51)
+      allow(Process).to receive(:euid).and_return(50)
 
       Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) {}
 
@@ -53,17 +51,17 @@ describe Puppet::Util::SUIDManager do
 
     context "when root and not windows" do
       before :each do
-        Process.stubs(:uid).returns(0)
-        Puppet.features.stubs(:microsoft_windows?).returns(false)
+        allow(Process).to receive(:uid).and_return(0)
+        allow(Puppet.features).to receive(:microsoft_windows?).and_return(false)
       end
 
       it "should set euid/egid" do
-        Process.stubs(:egid).returns(51).then.returns(51).then.returns(user[:gid])
-        Process.stubs(:euid).returns(50).then.returns(50).then.returns(user[:uid])
+        allow(Process).to receive(:egid).and_return(51, 51, user[:gid])
+        allow(Process).to receive(:euid).and_return(50, 50, user[:uid])
 
-        Puppet::Util::SUIDManager.stubs(:convert_xid).with(:gid, 51).returns(51)
-        Puppet::Util::SUIDManager.stubs(:convert_xid).with(:uid, 50).returns(50)
-        Puppet::Util::SUIDManager.stubs(:initgroups).returns([])
+        allow(Puppet::Util::SUIDManager).to receive(:convert_xid).with(:gid, 51).and_return(51)
+        allow(Puppet::Util::SUIDManager).to receive(:convert_xid).with(:uid, 50).and_return(50)
+        allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
 
         yielded = false
         Puppet::Util::SUIDManager.asuser(user[:uid], user[:gid]) do
@@ -95,7 +93,7 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should change gid to the primary group of uid by default" do
-        Process.stubs(:initgroups)
+        allow(Process).to receive(:initgroups)
 
         yielded = false
         Puppet::Util::SUIDManager.asuser(42) { yielded = true }
@@ -107,13 +105,10 @@ describe Puppet::Util::SUIDManager do
         # I don't like the sequence, but it is the only way to assert on the
         # internal behaviour in a reliable fashion, given we need multiple
         # sequenced calls to the same methods. --daniel 2012-02-05
-        horror = sequence('of user and group changes')
-        Puppet::Util::SUIDManager.expects(:change_group).with(43, false).in_sequence(horror)
-        Puppet::Util::SUIDManager.expects(:change_user).with(42, false).in_sequence(horror)
-        Puppet::Util::SUIDManager.expects(:change_group).
-          with(Puppet::Util::SUIDManager.egid, false).in_sequence(horror)
-        Puppet::Util::SUIDManager.expects(:change_user).
-          with(Puppet::Util::SUIDManager.euid, false).in_sequence(horror)
+        expect(Puppet::Util::SUIDManager).to receive(:change_group).with(43, false).ordered()
+        expect(Puppet::Util::SUIDManager).to receive(:change_user).with(42, false).ordered()
+        expect(Puppet::Util::SUIDManager).to receive(:change_group).with(Puppet::Util::SUIDManager.egid, false).ordered()
+        expect(Puppet::Util::SUIDManager).to receive(:change_user).with(Puppet::Util::SUIDManager.euid, false).ordered()
 
         yielded = false
         Puppet::Util::SUIDManager.asuser(42, 43) { yielded = true }
@@ -131,7 +126,7 @@ describe Puppet::Util::SUIDManager do
   describe "#change_group" do
     describe "when changing permanently" do
       it "should change_privilege" do
-        Process::GID.expects(:change_privilege).with do |gid|
+        expect(Process::GID).to receive(:change_privilege) do |gid|
           Process.gid = gid
           Process.egid = gid
         end
@@ -143,7 +138,7 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should not change_privilege when gid already matches" do
-        Process::GID.expects(:change_privilege).with do |gid|
+        expect(Process::GID).to receive(:change_privilege) do |gid|
           Process.gid = 42
           Process.egid = 42
         end
@@ -168,25 +163,26 @@ describe Puppet::Util::SUIDManager do
   describe "#change_user" do
     describe "when changing permanently" do
       it "should change_privilege" do
-        Process::UID.expects(:change_privilege).with do |uid|
+        expect(Process::UID).to receive(:change_privilege) do |uid|
           Process.uid = uid
           Process.euid = uid
         end
 
-        Puppet::Util::SUIDManager.expects(:initgroups).with(42)
+        expect(Puppet::Util::SUIDManager).to receive(:initgroups).with(42)
 
         Puppet::Util::SUIDManager.change_user(42, true)
 
         expect(xids[:euid]).to eq(42)
         expect(xids[:uid]).to eq(42)
       end
+
       it "should not change_privilege when uid already matches" do
-        Process::UID.expects(:change_privilege).with do |uid|
+        expect(Process::UID).to receive(:change_privilege) do |uid|
           Process.uid = 42
           Process.euid = 42
         end
 
-        Puppet::Util::SUIDManager.expects(:initgroups).with(42)
+        expect(Puppet::Util::SUIDManager).to receive(:initgroups).with(42)
 
         Puppet::Util::SUIDManager.change_user(42, true)
 
@@ -197,7 +193,7 @@ describe Puppet::Util::SUIDManager do
 
     describe "when changing temporarily" do
       it "should change only euid and groups" do
-        Puppet::Util::SUIDManager.stubs(:initgroups).returns([])
+        allow(Puppet::Util::SUIDManager).to receive(:initgroups).and_return([])
         Puppet::Util::SUIDManager.change_user(42, false)
 
         expect(xids[:euid]).to eq(42)
@@ -205,23 +201,19 @@ describe Puppet::Util::SUIDManager do
       end
 
       it "should set euid before groups if changing to root" do
-        Process.stubs(:euid).returns 50
-
-        when_not_root = sequence 'when_not_root'
+        allow(Process).to receive(:euid).and_return(50)
 
-        Process.expects(:euid=).in_sequence(when_not_root)
-        Puppet::Util::SUIDManager.expects(:initgroups).in_sequence(when_not_root)
+        expect(Process).to receive(:euid=).ordered()
+        expect(Puppet::Util::SUIDManager).to receive(:initgroups).ordered()
 
         Puppet::Util::SUIDManager.change_user(0, false)
       end
 
       it "should set groups before euid if changing from root" do
-        Process.stubs(:euid).returns 0
+        allow(Process).to receive(:euid).and_return(0)
 
-        when_root = sequence 'when_root'
-
-        Puppet::Util::SUIDManager.expects(:initgroups).in_sequence(when_root)
-        Process.expects(:euid=).in_sequence(when_root)
+        expect(Puppet::Util::SUIDManager).to receive(:initgroups).ordered()
+        expect(Process).to receive(:euid=).ordered()
 
         Puppet::Util::SUIDManager.change_user(50, false)
       end
@@ -231,18 +223,18 @@ describe Puppet::Util::SUIDManager do
   describe "#root?" do
     describe "on POSIX systems" do
       before :each do
-        Puppet.features.stubs(:posix?).returns(true)
-        Puppet.features.stubs(:microsoft_windows?).returns(false)
+        allow(Puppet.features).to receive(:posix?).and_return(true)
+        allow(Puppet.features).to receive(:microsoft_windows?).and_return(false)
       end
 
       it "should be root if uid is 0" do
-        Process.stubs(:uid).returns(0)
+        allow(Process).to receive(:uid).and_return(0)
 
         expect(Puppet::Util::SUIDManager).to be_root
       end
 
       it "should not be root if uid is not 0" do
-        Process.stubs(:uid).returns(1)
+        allow(Process).to receive(:uid).and_return(1)
 
         expect(Puppet::Util::SUIDManager).not_to be_root
       end
@@ -250,13 +242,13 @@ describe Puppet::Util::SUIDManager do
 
     describe "on Microsoft Windows", :if => Puppet.features.microsoft_windows? do
       it "should be root if user is privileged" do
-        Puppet::Util::Windows::User.stubs(:admin?).returns true
+        allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(true)
 
         expect(Puppet::Util::SUIDManager).to be_root
       end
 
       it "should not be root if user is not privileged" do
-        Puppet::Util::Windows::User.stubs(:admin?).returns false
+        allow(Puppet::Util::Windows::User).to receive(:admin?).and_return(false)
 
         expect(Puppet::Util::SUIDManager).not_to be_root
       end
@@ -269,16 +261,15 @@ describe 'Puppet::Util::SUIDManager#groups=' do
     Puppet::Util::SUIDManager
   end
 
-
   it "(#3419) should rescue Errno::EINVAL on OS X" do
-    Process.expects(:groups=).raises(Errno::EINVAL, 'blew up')
-    subject.expects(:osx_maj_ver).returns('10.7').twice
+    expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
+    expect(subject).to receive(:osx_maj_ver).and_return('10.7').twice
     subject.groups = ['list', 'of', 'groups']
   end
 
   it "(#3419) should fail if an Errno::EINVAL is raised NOT on OS X" do
-    Process.expects(:groups=).raises(Errno::EINVAL, 'blew up')
-    subject.expects(:osx_maj_ver).returns(false)
+    expect(Process).to receive(:groups=).and_raise(Errno::EINVAL, 'blew up')
+    expect(subject).to receive(:osx_maj_ver).and_return(false)
     expect { subject.groups = ['list', 'of', 'groups'] }.to raise_error(Errno::EINVAL)
   end
 end

data/spec/unit/util/symbolic_file_mode_spec.rb

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

data/spec/unit/util/tag_set_spec.rb

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

data/spec/unit/util/tagging_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 # coding: utf-8
 require 'spec_helper'
 

data/spec/unit/util/terminal_spec.rb

@@ -1,41 +1,40 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/util/terminal'
 
 describe Puppet::Util::Terminal do
   describe '.width' do
-    before { Puppet.features.stubs(:posix?).returns(true) }
+    before { allow(Puppet.features).to receive(:posix?).and_return(true) }
 
     it 'should invoke `stty` and return the width' do
       height, width = 100, 200
-      subject.expects(:`).with('stty size 2>/dev/null').returns("#{height} #{width}\n")
+      expect(subject).to receive(:`).with('stty size 2>/dev/null').and_return("#{height} #{width}\n")
       expect(subject.width).to eq(width)
     end
 
     it 'should use `tput` if `stty` is unavailable' do
       width = 200
-      subject.expects(:`).with('stty size 2>/dev/null').returns("\n")
-      subject.expects(:`).with('tput cols 2>/dev/null').returns("#{width}\n")
+      expect(subject).to receive(:`).with('stty size 2>/dev/null').and_return("\n")
+      expect(subject).to receive(:`).with('tput cols 2>/dev/null').and_return("#{width}\n")
       expect(subject.width).to eq(width)
     end
 
     it 'should default to 80 columns if `tput` and `stty` are unavailable' do
       width = 80
-      subject.expects(:`).with('stty size 2>/dev/null').returns("\n")
-      subject.expects(:`).with('tput cols 2>/dev/null').returns("\n")
+      expect(subject).to receive(:`).with('stty size 2>/dev/null').and_return("\n")
+      expect(subject).to receive(:`).with('tput cols 2>/dev/null').and_return("\n")
       expect(subject.width).to eq(width)
     end
 
     it 'should default to 80 columns if `tput` or `stty` raise exceptions' do
       width = 80
-      subject.expects(:`).with('stty size 2>/dev/null').raises()
-      subject.stubs(:`).with('tput cols 2>/dev/null').returns("#{width + 1000}\n")
+      expect(subject).to receive(:`).with('stty size 2>/dev/null').and_raise()
+      allow(subject).to receive(:`).with('tput cols 2>/dev/null').and_return("#{width + 1000}\n")
       expect(subject.width).to eq(width)
     end
 
     it 'should default to 80 columns if not in a POSIX environment' do
       width = 80
-      Puppet.features.stubs(:posix?).returns(false)
+      allow(Puppet.features).to receive(:posix?).and_return(false)
       expect(subject.width).to eq(width)
     end
   end

data/spec/unit/util/user_attr_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/user_attr'
@@ -6,7 +5,7 @@ require 'puppet/util/user_attr'
 describe UserAttr do
   before do
     user_attr = ["foo::::type=role", "bar::::type=normal;profile=foobar"]
-    File.stubs(:readlines).returns(user_attr)
+    allow(File).to receive(:readlines).and_return(user_attr)
   end
 
   describe "when getting attributes by name" do

data/spec/unit/util/warnings_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Util::Warnings do
@@ -22,18 +21,18 @@ describe Puppet::Util::Warnings do
       end
 
       it "should issue a warning" do
-        Puppet.expects(log).with(@msg1)
+        expect(Puppet).to receive(log).with(@msg1)
         Puppet::Util::Warnings.send(method, @msg1)
       end
 
       it "should issue a warning exactly once per unique message" do
-        Puppet.expects(log).with(@msg1).once
+        expect(Puppet).to receive(log).with(@msg1).once
         Puppet::Util::Warnings.send(method, @msg1)
         Puppet::Util::Warnings.send(method, @msg1)
       end
 
       it "should issue multiple warnings for multiple unique messages" do
-        Puppet.expects(log).times(2)
+        expect(Puppet).to receive(log).twice()
         Puppet::Util::Warnings.send(method, @msg1)
         Puppet::Util::Warnings.send(method, @msg2)
       end

data/spec/unit/util/watcher/periodic_watcher_spec.rb

@@ -8,7 +8,7 @@ describe Puppet::Util::Watcher::PeriodicWatcher do
   let(:a_value) { 15 }
   let(:a_different_value) { 16 }
 
-  let(:unused_watcher) { mock('unused watcher') }
+  let(:unused_watcher) { double('unused watcher') }
   let(:unchanged_watcher) { a_watcher_reporting(a_value) }
   let(:changed_watcher) { a_watcher_reporting(a_value, a_different_value) }
 
@@ -46,7 +46,7 @@ describe Puppet::Util::Watcher::PeriodicWatcher do
 
   def a_time_that_reports_expired_as(expired, timeout)
     timer = Puppet::Util::Watcher::Timer.new(timeout)
-    timer.stubs(:expired?).returns(expired)
+    allow(timer).to receive(:expired?).and_return(expired)
     timer
   end
 end