puppet 5.5.12-x86-mingw32 → 5.5.13-x86-mingw32

data/spec/unit/etc_spec.rb

@@ -102,12 +102,11 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
     user
   end
 
-  shared_examples "methods that return an overridden group struct from Etc" do |params|
-
+  shared_examples "methods that return an overridden group struct from Etc" do |param|
     it "should return a new Struct object with corresponding canonical_ members" do
       group = Etc::Group.new
-      Etc.expects(subject).with(*params).returns(group)
-      puppet_group = Puppet::Etc.send(subject, *params)
+      expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(group)
+      puppet_group = Puppet::Etc.send(subject, *param)
 
       expect(puppet_group.members).to include(*group.members)
       expect(puppet_group.members).to include(*group.members.map { |mem| "canonical_#{mem}".to_sym })
@@ -118,12 +117,12 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
     context "when Encoding.default_external is UTF-8" do
       before do
-        Etc.expects(subject).with(*params).returns(utf_8_group_struct)
+        expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(utf_8_group_struct)
       end
 
       let(:overridden) {
         PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
-          Puppet::Etc.send(subject, *params)
+          Puppet::Etc.send(subject, *param)
         end
       }
 
@@ -168,12 +167,12 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
     context "when Encoding.default_external is EUC_KR (i.e., neither UTF-8 nor POSIX)" do
       before do
-        Etc.expects(subject).with(*params).returns(euc_kr_group_struct)
+        expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(euc_kr_group_struct)
       end
 
       let(:overridden) {
         PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::EUC_KR) do
-          Puppet::Etc.send(subject, *params)
+          Puppet::Etc.send(subject, *param)
         end
       }
 
@@ -210,12 +209,12 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
     context "when Encoding.default_external is POSIX (ASCII-7bit)" do
       before do
-        Etc.expects(subject).with(*params).returns(ascii_group_struct)
+        expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(ascii_group_struct)
       end
 
       let(:overridden) {
         PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ASCII) do
-          Puppet::Etc.send(subject, *params)
+          Puppet::Etc.send(subject, *param)
         end
       }
 
@@ -251,12 +250,11 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
     end
   end
 
-  shared_examples "methods that return an overridden user struct from Etc" do |params|
-
+  shared_examples "methods that return an overridden user struct from Etc" do |param|
     it "should return a new Struct object with corresponding canonical_ members" do
       user = Etc::Passwd.new
-      Etc.expects(subject).with(*params).returns(user)
-      puppet_user = Puppet::Etc.send(subject, *params)
+      expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(user)
+      puppet_user = Puppet::Etc.send(subject, *param)
 
       expect(puppet_user.members).to include(*user.members)
       expect(puppet_user.members).to include(*user.members.map { |mem| "canonical_#{mem}".to_sym })
@@ -266,12 +264,12 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
     context "when Encoding.default_external is UTF-8" do
       before do
-        Etc.expects(subject).with(*params).returns(utf_8_user_struct)
+        expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(utf_8_user_struct)
       end
 
       let(:overridden) {
         PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
-          Puppet::Etc.send(subject, *params)
+          Puppet::Etc.send(subject, *param)
         end
       }
 
@@ -303,12 +301,12 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
     context "when Encoding.default_external is EUC_KR (i.e., neither UTF-8 nor POSIX)" do
       before do
-        Etc.expects(subject).with(*params).returns(euc_kr_user_struct)
+        expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(euc_kr_user_struct)
       end
 
       let(:overridden) {
         PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::EUC_KR) do
-          Puppet::Etc.send(subject, *params)
+          Puppet::Etc.send(subject, *param)
         end
       }
 
@@ -336,12 +334,12 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
     context "when Encoding.default_external is POSIX (ASCII-7bit)" do
       before do
-        Etc.expects(subject).with(*params).returns(ascii_user_struct)
+        expect(Etc).to receive(subject).with(param.nil? ? no_args : param).and_return(ascii_user_struct)
       end
 
       let(:overridden) {
         PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ASCII) do
-          Puppet::Etc.send(subject, *params)
+          Puppet::Etc.send(subject, *param)
         end
       }
 
@@ -376,7 +374,7 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
     it_should_behave_like "methods that return an overridden group struct from Etc", 'foo'
 
     it "should call Etc.getgrnam with the supplied group name" do
-      Etc.expects(:getgrnam).with('foo')
+      expect(Etc).to receive(:getgrnam).with('foo')
       Puppet::Etc.getgrnam('foo')
     end
   end
@@ -385,7 +383,7 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
     it_should_behave_like "methods that return an overridden group struct from Etc", 0
 
     it "should call Etc.getgrgid with supplied group id" do
-      Etc.expects(:getgrgid).with(0)
+      expect(Etc).to receive(:getgrgid).with(0)
       Puppet::Etc.getgrgid(0)
     end
   end
@@ -398,7 +396,7 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
     it_should_behave_like "methods that return an overridden user struct from Etc", 'foo'
 
     it "should call Etc.getpwnam with that username" do
-      Etc.expects(:getpwnam).with('foo')
+      expect(Etc).to receive(:getpwnam).with('foo')
       Puppet::Etc.getpwnam('foo')
     end
   end
@@ -407,14 +405,14 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
     it_should_behave_like "methods that return an overridden user struct from Etc", 2
 
     it "should call Etc.getpwuid with the id" do
-      Etc.expects(:getpwuid).with(2)
+      expect(Etc).to receive(:getpwuid).with(2)
       Puppet::Etc.getpwuid(2)
     end
   end
 
   describe :group do
     it 'should return the next group struct if a block is not provided' do
-      Puppet::Etc.expects(:getgrent).returns(ascii_group_struct)
+      expect(Puppet::Etc).to receive(:getgrent).and_return(ascii_group_struct)
 
       expect(Puppet::Etc.group).to eql(ascii_group_struct)
     end
@@ -425,10 +423,10 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
         euc_kr_group_struct,
         ascii_group_struct
       ]
-      Puppet::Etc.stubs(:getgrent).returns(*(expected_groups + [nil]))
+      allow(Puppet::Etc).to receive(:getgrent).and_return(*(expected_groups + [nil]))
 
-      Puppet::Etc.expects(:setgrent)
-      Puppet::Etc.expects(:endgrent)
+      expect(Puppet::Etc).to receive(:setgrent)
+      expect(Puppet::Etc).to receive(:endgrent)
 
       actual_groups = []
       Puppet::Etc.group { |group| actual_groups << group }
@@ -439,28 +437,28 @@ describe Puppet::Etc, :if => !Puppet.features.microsoft_windows? do
 
   describe "endgrent" do
     it "should call Etc.getgrent" do
-      Etc.expects(:getgrent)
+      expect(Etc).to receive(:getgrent)
       Puppet::Etc.getgrent
     end
   end
 
   describe "setgrent" do
     it "should call Etc.setgrent" do
-      Etc.expects(:setgrent)
+      expect(Etc).to receive(:setgrent)
       Puppet::Etc.setgrent
     end
   end
 
   describe "endpwent" do
     it "should call Etc.endpwent" do
-      Etc.expects(:endpwent)
+      expect(Etc).to receive(:endpwent)
       Puppet::Etc.endpwent
     end
   end
 
   describe "setpwent" do
     it "should call Etc.setpwent" do
-      Etc.expects(:setpwent)
+      expect(Etc).to receive(:setpwent)
       Puppet::Etc.setpwent
     end
   end

data/spec/unit/external/pson_spec.rb

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

data/spec/unit/face/ca_spec.rb

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

data/spec/unit/face/catalog_spec.rb

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

data/spec/unit/face/certificate_request_spec.rb

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

data/spec/unit/face/certificate_revocation_list_spec.rb

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

data/spec/unit/face/certificate_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 
@@ -18,14 +17,14 @@ describe Puppet::Face[:certificate, '0.0.1'] do
 
   before :each do
     Puppet[:confdir] = tmpdir('conf')
-    Puppet::SSL::CertificateAuthority.stubs(:ca?).returns true
+    allow(Puppet::SSL::CertificateAuthority).to receive(:ca?).and_return(true)
 
     Puppet::SSL::Host.ca_location = :local
 
     # We can't cache the CA between tests, because each one has its own SSL dir.
     ca = Puppet::SSL::CertificateAuthority.new
-    Puppet::SSL::CertificateAuthority.stubs(:new).returns ca
-    Puppet::SSL::CertificateAuthority.stubs(:instance).returns ca
+    allow(Puppet::SSL::CertificateAuthority).to receive(:new).and_return(ca)
+    allow(Puppet::SSL::CertificateAuthority).to receive(:instance).and_return(ca)
   end
 
   it "should have a ca-location option" do
@@ -33,17 +32,15 @@ describe Puppet::Face[:certificate, '0.0.1'] do
   end
 
   it "should set the ca location when invoked" do
-    Puppet::SSL::Host.expects(:ca_location=).with(:local)
-    ca.expects(:sign).with do |name,options|
-      name == "hello, friend"
-    end
+    expect(Puppet::SSL::Host).to receive(:ca_location=).with(:local)
+    expect(ca).to receive(:sign).with("hello, friend", anything)
 
     subject.sign "hello, friend", :ca_location => :local
   end
 
   it "(#7059) should set the ca location when an inherited action is invoked" do
-    Puppet::SSL::Host.expects(:ca_location=).with(:local)
-    subject.indirection.expects(:find)
+    expect(Puppet::SSL::Host).to receive(:ca_location=).with(:local)
+    expect(subject.indirection).to receive(:find)
     subject.find "hello, friend", :ca_location => :local
   end
 

data/spec/unit/face/config_spec.rb

@@ -1,8 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/face'
 
-module PuppetFaceSpecs
 describe Puppet::Face[:config, '0.0.1'] do
 
   let(:config) { described_class }
@@ -65,7 +63,7 @@ trace = true
     #This has to be after the settings above, which resets the value
     Puppet[:log_level] = 'info'
 
-    Puppet.expects(:warning).never
+    expect(Puppet).not_to receive(:warning)
     expect {
       result = subject.print("syslogfacility", :section => "user")
       expect(render(:print, result)).to eq("file\n")
@@ -76,7 +74,7 @@ trace = true
     Puppet[:log_level] = 'info'
     Puppet[:trace] = true
 
-    Puppet.expects(:warning).with("No section specified; defaulting to 'main'.\nSet the config section " +
+    expect(Puppet).to receive(:warning).with("No section specified; defaulting to 'main'.\nSet the config section " +
       "by using the `--section` flag.\nFor example, `puppet config --section user print foo`.\nFor more " +
       "information, see https://puppet.com/docs/puppet/latest/configuration.html")
     expect {
@@ -89,7 +87,7 @@ trace = true
     Puppet[:log_level] = 'notice'
     Puppet[:trace] = true
 
-    Puppet.expects(:warning).never
+    expect(Puppet).not_to receive(:warning)
     expect {
       result = subject.print("trace")
       expect(render(:print, result)).to eq("true\n")
@@ -132,13 +130,13 @@ trace = true
     let(:path) { Pathname.new(config_file).expand_path }
     before(:each) do
       Puppet[:config] = config_file
-      Puppet::FileSystem.stubs(:pathname).with(path.to_s).returns(path)
-      Puppet::FileSystem.stubs(:touch)
+      allow(Puppet::FileSystem).to receive(:pathname).with(path.to_s).and_return(path)
+      allow(Puppet::FileSystem).to receive(:touch)
     end
 
     it "prints the section and environment when no section is given and verbose is set" do
       Puppet[:log_level] = 'info'
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
       expect {
         subject.set('foo', 'bar')
       }.to output("\e[1;33mResolving settings from section 'main' in environment 'production'\e[0m\n").to_stderr
@@ -146,40 +144,40 @@ trace = true
 
     it "prints the section and environment when a section is given and verbose is set" do
       Puppet[:log_level] = 'info'
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
       expect {
         subject.set('foo', 'bar', {:section => "baz"})
       }.to output("\e[1;33mResolving settings from section 'baz' in environment 'production'\e[0m\n").to_stderr
     end
 
     it "writes to the correct puppet config file" do
-      Puppet::FileSystem.expects(:open).with(path, anything, anything)
+      expect(Puppet::FileSystem).to receive(:open).with(path, anything, anything)
       subject.set('foo', 'bar')
     end
 
     it "creates a config file if one does not exist" do
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
-      Puppet::FileSystem.expects(:touch).with(path)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
+      expect(Puppet::FileSystem).to receive(:touch).with(path)
       subject.set('foo', 'bar')
     end
 
     it "sets the supplied config/value in the default section (main)" do
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
       config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
       manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
-      Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
+      allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
 
-      manipulator.expects(:set).with("main", "foo", "bar")
+      expect(manipulator).to receive(:set).with("main", "foo", "bar")
       subject.set('foo', 'bar')
     end
 
     it "sets the value in the supplied section" do
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
       config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
       manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
-      Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
+      allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
 
-      manipulator.expects(:set).with("baz", "foo", "bar")
+      expect(manipulator).to receive(:set).with("baz", "foo", "bar")
       subject.set('foo', 'bar', {:section => "baz"})
     end
 
@@ -190,7 +188,7 @@ trace = true
       CONF
 
       myfile = StringIO.new(contents)
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(myfile)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(myfile)
 
       subject.set('foo', 'bar')
 
@@ -199,7 +197,7 @@ trace = true
     end
 
     it "opens the file with UTF-8 encoding" do
-      Puppet::FileSystem.expects(:open).with(path, nil, 'r+:UTF-8')
+      expect(Puppet::FileSystem).to receive(:open).with(path, nil, 'r+:UTF-8')
       subject.set('foo', 'bar')
     end
   end
@@ -207,14 +205,15 @@ trace = true
   context 'when the puppet.conf file does not exist' do
     let(:config_file) { '/foo/puppet.conf' }
     let(:path) { Pathname.new(config_file).expand_path }
+
     before(:each) do
       Puppet[:config] = config_file
-      Puppet::FileSystem.stubs(:pathname).with(path.to_s).returns(path)
+      allow(Puppet::FileSystem).to receive(:pathname).with(path.to_s).and_return(path)
     end
 
     it 'prints a message when the puppet.conf file does not exist' do
-      Puppet::FileSystem.stubs(:exist?).with(path).returns(false)
-      Puppet.expects(:warning).with("The puppet.conf file does not exist #{path.to_s}")
+      allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(false)
+      expect(Puppet).to receive(:warning).with("The puppet.conf file does not exist #{path.to_s}")
       subject.delete('setting', {:section => 'main'})
     end
   end
@@ -224,34 +223,33 @@ trace = true
     let(:path) { Pathname.new(config_file).expand_path }
     before(:each) do
       Puppet[:config] = config_file
-      Puppet::FileSystem.stubs(:pathname).with(path.to_s).returns(path)
-      Puppet::FileSystem.stubs(:exist?).with(path).returns(true)
+      allow(Puppet::FileSystem).to receive(:pathname).with(path.to_s).and_return(path)
+      allow(Puppet::FileSystem).to receive(:exist?).with(path).and_return(true)
     end
 
     it 'prints a message about what was deleted' do
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
       config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
       manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
-      Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
+      allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
 
-      manipulator.expects(:delete).with('main', 'setting').returns('    setting=value')
+      expect(manipulator).to receive(:delete).with('main', 'setting').and_return('    setting=value')
       expect { subject.delete('setting', {:section => 'main'}) }.to have_printed("Deleted setting from 'main': 'setting=value'")
     end
 
     it 'prints a warning when a setting is not found to delete' do
-      Puppet::FileSystem.stubs(:open).with(path, anything, anything).yields(StringIO.new)
+      allow(Puppet::FileSystem).to receive(:open).with(path, anything, anything).and_yield(StringIO.new)
       config = Puppet::Settings::IniFile.new([Puppet::Settings::IniFile::DefaultSection.new])
       manipulator = Puppet::Settings::IniFile::Manipulator.new(config)
-      Puppet::Settings::IniFile::Manipulator.stubs(:new).returns(manipulator)
+      allow(Puppet::Settings::IniFile::Manipulator).to receive(:new).and_return(manipulator)
 
-      manipulator.expects(:delete).with('main', 'setting').returns(nil)
-      Puppet.expects(:warning).with("No setting found in configuration file for section 'main' setting name 'setting'")
+      expect(manipulator).to receive(:delete).with('main', 'setting').and_return(nil)
+      expect(Puppet).to receive(:warning).with("No setting found in configuration file for section 'main' setting name 'setting'")
       subject.delete('setting', {:section => 'main'})
     end
   end
 
   shared_examples_for :config_printing_a_section do |section|
-
     def add_section_option(args, section)
       args << { :section => section } if section
       args
@@ -337,7 +335,6 @@ modulepath =
     end
 
     context "from master section" do
-
       before(:each) do
         Puppet.settings.parse_config(<<-CONF)
         [master]
@@ -350,4 +347,3 @@ modulepath =
     end
   end
 end
-end