puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

data/spec/unit/type/user_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 # encoding: UTF-8
 require 'spec_helper'
 
@@ -13,7 +12,7 @@ describe Puppet::Type.type(:user) do
       def flush; end
       def self.instances; []; end
     end
-    described_class.stubs(:defaultprovider).returns @provider_class
+    allow(described_class).to receive(:defaultprovider).and_return(@provider_class)
   end
 
   it "should be able to create an instance" do
@@ -65,12 +64,12 @@ describe Puppet::Type.type(:user) do
     end
 
     it "cannot be set to true for a provider that does not manage homedirs" do
-      provider.class.stubs(:manages_homedir?).returns false
+      allow(provider.class).to receive(:manages_homedir?).and_return(false)
       expect { instance[:managehome] = 'yes' }.to raise_error(Puppet::Error, /can not manage home directories/)
     end
 
     it "can be set to true for a provider that does manage homedirs" do
-      provider.class.stubs(:manages_homedir?).returns true
+      allow(provider.class).to receive(:manages_homedir?).and_return(true)
       instance[:managehome] = 'yes'
     end
   end
@@ -127,8 +126,8 @@ describe Puppet::Type.type(:user) do
     end
 
     it "should set all values to :absent if the user is absent" do
-      @user.property(:ensure).expects(:retrieve).returns :absent
-      @user.property(:uid).expects(:retrieve).never
+      expect(@user.property(:ensure)).to receive(:retrieve).and_return(:absent)
+      expect(@user.property(:uid)).not_to receive(:retrieve)
       expect(@user.retrieve[@user.property(:uid)]).to eq(:absent)
     end
 
@@ -148,13 +147,13 @@ describe Puppet::Type.type(:user) do
 
     it "should call :create on the provider when asked to sync to the :present state" do
       @provider = @provider_class.new(:name => 'foo', :ensure => :absent)
-      @provider.expects(:create)
+      expect(@provider).to receive(:create)
       described_class.new(:name => 'foo', :ensure => :present, :provider => @provider).parameter(:ensure).sync
     end
 
     it "should call :delete on the provider when asked to sync to the :absent state" do
       @provider = @provider_class.new(:name => 'foo', :ensure => :present)
-      @provider.expects(:delete)
+      expect(@provider).to receive(:delete)
       described_class.new(:name => 'foo', :ensure => :absent, :provider => @provider).parameter(:ensure).sync
     end
 
@@ -212,27 +211,27 @@ describe Puppet::Type.type(:user) do
       end
 
       it "should return true if any of the specified groups are equal to the current integer" do
-        Puppet::Util.expects(:gid).with("foo").returns 300
-        Puppet::Util.expects(:gid).with("bar").returns 500
+        expect(Puppet::Util).to receive(:gid).with("foo").and_return(300)
+        expect(Puppet::Util).to receive(:gid).with("bar").and_return(500)
         expect(described_class.new(:name => 'baz', :gid => [ 'foo', 'bar' ]).parameter(:gid)).to be_safe_insync(500)
       end
 
       it "should return false if none of the specified groups are equal to the current integer" do
-        Puppet::Util.expects(:gid).with("foo").returns 300
-        Puppet::Util.expects(:gid).with("bar").returns 500
+        expect(Puppet::Util).to receive(:gid).with("foo").and_return(300)
+        expect(Puppet::Util).to receive(:gid).with("bar").and_return(500)
         expect(described_class.new(:name => 'baz', :gid => [ 'foo', 'bar' ]).parameter(:gid)).to_not be_safe_insync(700)
       end
     end
 
     describe "when syncing" do
       it "should use the first found, specified group as the desired value and send it to the provider" do
-        Puppet::Util.expects(:gid).with("foo").returns nil
-        Puppet::Util.expects(:gid).with("bar").returns 500
+        expect(Puppet::Util).to receive(:gid).with("foo").and_return(nil)
+        expect(Puppet::Util).to receive(:gid).with("bar").and_return(500)
 
         @provider = @provider_class.new(:name => 'foo')
         resource = described_class.new(:name => 'foo', :provider => @provider, :gid => [ 'foo', 'bar' ])
 
-        @provider.expects(:gid=).with 500
+        expect(@provider).to receive(:gid=).with(500)
         resource.parameter(:gid).sync
       end
     end
@@ -257,7 +256,6 @@ describe Puppet::Type.type(:user) do
     end
 
     describe "when testing is in sync" do
-
       before :each do
         # the useradd provider uses a single string to represent groups and so does Puppet::Property::List when converting to should values
         @provider = @provider_class.new(:name => 'foo', :groups => 'a,b,e,f')
@@ -366,7 +364,7 @@ describe Puppet::Type.type(:user) do
         # useradd subclasses nameservice and thus inherits #comments_insync?
         user = described_class.new(:name => 'foo', :comment => @value, :provider => :useradd)
         comment_property = user.properties.find {|p| p.name == :comment}
-        user.provider.expects(:comments_insync?)
+        expect(user.provider).to receive(:comments_insync?)
         comment_property.insync?('bar')
       end
 
@@ -374,6 +372,7 @@ describe Puppet::Type.type(:user) do
         let(:is) { "\u2603" }
         let(:should) { "\u06FF" }
         let(:comment_property) { @user.properties.find { |p| p.name == :comment } }
+
         context "given is and should strings with incompatible encoding" do
           it "should return a formatted string" do
             is.force_encoding(Encoding::ASCII_8BIT)
@@ -409,7 +408,7 @@ describe Puppet::Type.type(:user) do
       Puppet::Resource::Catalog.new :testing do |conf|
         [testuser, testrole].each { |resource| conf.add_resource resource }
       end
-      Puppet::Type::User::ProviderDirectoryservice.stubs(:get_macosx_version_major).returns "10.5"
+      allow(Puppet::Type::User::ProviderDirectoryservice).to receive(:get_macosx_version_major).and_return("10.5")
 
       rel = testuser.autorequire[0]
       expect(rel.source.ref).to eq(testrole.ref)
@@ -431,15 +430,15 @@ describe Puppet::Type.type(:user) do
         def check_valid_shell; end
       end
 
-      described_class.stubs(:defaultprovider).returns @shell_provider_class
+      allow(described_class).to receive(:defaultprovider).and_return(@shell_provider_class)
     end
 
     it "should call :check_valid_shell on the provider when changing shell value" do
       @provider = @shell_provider_class.new(:name => 'foo', :shell => '/bin/bash', :ensure => :present)
-      @provider.expects(:check_valid_shell)
+      expect(@provider).to receive(:check_valid_shell)
       resource = described_class.new(:name => 'foo', :shell => '/bin/zsh', :provider => @provider)
-      Puppet::Util::Storage.stubs(:load)
-      Puppet::Util::Storage.stubs(:store)
+      allow(Puppet::Util::Storage).to receive(:load)
+      allow(Puppet::Util::Storage).to receive(:store)
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
       catalog.apply
@@ -447,10 +446,10 @@ describe Puppet::Type.type(:user) do
 
     it "should call :check_valid_shell on the provider when changing ensure from present to absent" do
       @provider = @shell_provider_class.new(:name => 'foo', :shell => '/bin/bash', :ensure => :absent)
-      @provider.expects(:check_valid_shell)
+      expect(@provider).to receive(:check_valid_shell)
       resource = described_class.new(:name => 'foo', :shell => '/bin/zsh', :provider => @provider)
-      Puppet::Util::Storage.stubs(:load)
-      Puppet::Util::Storage.stubs(:store)
+      allow(Puppet::Util::Storage).to receive(:load)
+      allow(Puppet::Util::Storage).to receive(:store)
       catalog = Puppet::Resource::Catalog.new
       catalog.add_resource resource
       catalog.apply

data/spec/unit/type/whit_spec.rb

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

data/spec/unit/type_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/property/boolean'
@@ -138,18 +137,18 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
 
   it "should delegate to the tagging module when tags are added" do
     resource = klass.new(:name => "foo")
-    resource.stubs(:tag).with(resource_type)
+    allow(resource).to receive(:tag).with(resource_type)
 
-    resource.expects(:tag).with(:tag1, :tag2)
+    expect(resource).to receive(:tag).with(:tag1, :tag2)
 
     resource.tags = [:tag1,:tag2]
   end
 
   it "should add the current type as tag" do
     resource = klass.new(:name => "foo")
-    resource.stubs(:tag)
+    allow(resource).to receive(:tag)
 
-    resource.expects(:tag).with(resource_type)
+    expect(resource).to receive(:tag).with(resource_type)
 
     resource.tags = [:tag1,:tag2]
   end
@@ -255,7 +254,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
 
     {:file => "/my/file", :line => 50}.each do |attr, value|
       it "should set the #{attr}" do
-        @resource.stubs(attr).returns value
+        allow(@resource).to receive(attr).and_return(value)
         expect(@resource.event.send(attr)).to eq(value)
       end
     end
@@ -394,8 +393,8 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
       basic = type.provide(:basic) {}
       greater = type.provide(:greater) {}
 
-      basic.stubs(:specificity).returns 1
-      greater.stubs(:specificity).returns 2
+      allow(basic).to receive(:specificity).and_return(1)
+      allow(greater).to receive(:specificity).and_return(2)
 
       expect(type.defaultprovider).to equal(greater)
     end
@@ -603,7 +602,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
         resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo", :remounts => true},
                                         :sensitive_parameters => [:remounts])
-        klass.any_instance.expects(:warning).with(regexp_matches(/Unable to mark 'remounts' as sensitive: remounts is a parameter and not a property/))
+        expect_any_instance_of(klass).to receive(:warning).with(/Unable to mark 'remounts' as sensitive: remounts is a parameter and not a property/)
         klass.new(resource)
       end
 
@@ -611,7 +610,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
         resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo"},
                                         :sensitive_parameters => [:device])
-        klass.any_instance.expects(:warning).with("Unable to mark 'device' as sensitive: the property itself was not assigned a value.")
+        expect_any_instance_of(klass).to receive(:warning).with("Unable to mark 'device' as sensitive: the property itself was not assigned a value.")
         klass.new(resource)
       end
 
@@ -619,7 +618,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
         resource = Puppet::Resource.new(resource_type, "/foo",
                                         :parameters => {:atboot => :yes, :fstype => "boo"},
                                         :sensitive_parameters => [:content])
-        klass.any_instance.expects(:err).with("Unable to mark 'content' as sensitive: the property itself is not defined on #{resource_type}.")
+        expect_any_instance_of(klass).to receive(:err).with("Unable to mark 'content' as sensitive: the property itself is not defined on #{resource_type}.")
         klass.new(resource)
       end
     end
@@ -673,8 +672,8 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
       end
 
       it "should include the file/line in the error" do
-        Puppet::Type.type(:file).any_instance.stubs(:file).returns("example.pp")
-        Puppet::Type.type(:file).any_instance.stubs(:line).returns(42)
+        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return("example.pp")
+        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(42)
         expect { Puppet::Type.type(:file).new(:title => "/foo", :source => "unknown:///") }.to raise_error(Puppet::ResourceError, /\(file: example\.pp, line: 42\)/)
       end
     end
@@ -690,15 +689,15 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should set the attributes in the order returned by the class's :allattrs method" do
-      klass.stubs(:allattrs).returns([:name, :atboot, :noop])
+      allow(klass).to receive(:allattrs).and_return([:name, :atboot, :noop])
       resource = Puppet::Resource.new(resource_type, "/foo", :parameters => {:name => "myname", :atboot => :yes, :noop => "whatever"})
 
       set = []
 
-      klass.any_instance.stubs(:newattr).with do |param, hash|
+      allow_any_instance_of(klass).to receive(:newattr) do |_, param, hash|
         set << param
-        true
-      end.returns(stub_everything("a property"))
+        double("a property", :value= => nil, :default => nil, :name => nil)
+      end
 
       klass.new(resource)
 
@@ -707,15 +706,15 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should always set the name and then default provider before anything else" do
-      klass.stubs(:allattrs).returns([:provider, :name, :atboot])
+      allow(klass).to receive(:allattrs).and_return([:provider, :name, :atboot])
       resource = Puppet::Resource.new(resource_type, "/foo", :parameters => {:name => "myname", :atboot => :yes})
 
       set = []
 
-      klass.any_instance.stubs(:newattr).with do |param, hash|
+      allow_any_instance_of(klass).to receive(:newattr) do |_, param, hash|
         set << param
-        true
-      end.returns(stub_everything("a property"))
+        double("a property", :value= => nil, :default => nil, :name => nil)
+      end
 
       klass.new(resource)
       expect(set[0]).to eq(:name)
@@ -728,10 +727,10 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
       # on jruby. Thus, we stub it out here since we don't care to do any assertions on it.
       # This is only an issue if you're running these unit tests on a platform where upstart
       # is a default provider, like Ubuntu trusty.
-      Puppet::Util::Execution.stubs(:execute)
+      allow(Puppet::Util::Execution).to receive(:execute)
 
       defaults = []
-      Puppet::Type.type(:service).any_instance.stubs(:set_default).with { |value| defaults << value; true }
+      allow_any_instance_of(Puppet::Type.type(:service)).to receive(:set_default) { |_, value| defaults << value }
 
       Puppet::Type.type(:service).new :name => "whatever"
 
@@ -748,7 +747,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
 
     context "when validating the resource" do
       it "should call the type's validate method if present" do
-        Puppet::Type.type(:file).any_instance.expects(:validate)
+        expect_any_instance_of(Puppet::Type.type(:file)).to receive(:validate)
         Puppet::Type.type(:file).new(:name => make_absolute('/foo'))
       end
 
@@ -763,8 +762,8 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
       end
 
       it "should raise Puppet::ResourceError with manifest file and line on failure" do
-        Puppet::Type.type(:file).any_instance.stubs(:file).returns("example.pp")
-        Puppet::Type.type(:file).any_instance.stubs(:line).returns(42)
+        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:file).and_return("example.pp")
+        allow_any_instance_of(Puppet::Type.type(:file)).to receive(:line).and_return(42)
         expect do
           Puppet::Type.type(:file).new(
             :name => make_absolute('/foo'),
@@ -856,7 +855,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should use the Resource Type's namevar to determine how to find the name in the hash" do
-      @type.stubs(:key_attributes).returns([ :myname ])
+      allow(@type).to receive(:key_attributes).and_return([ :myname ])
 
       expect(@type.hash2resource(:myname => "foo").title).to eq("foo")
     end
@@ -890,26 +889,26 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
   describe "when retrieving current property values" do
     before do
       @resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-      @resource.property(:ensure).stubs(:retrieve).returns :absent
+      allow(@resource.property(:ensure)).to receive(:retrieve).and_return(:absent)
     end
 
     it "should always retrieve the ensure value by default" do
       @ensurable_resource = Puppet::Type.type(:file).new(:name => "/not/existent", :mode => "0644")
-      Puppet::Type::File::Ensure.stubs(:ensure).returns :absent
-      Puppet::Type::File::Ensure.any_instance.expects(:retrieve).once
+      allow(Puppet::Type::File::Ensure).to receive(:ensure).and_return(:absent)
+      expect_any_instance_of(Puppet::Type::File::Ensure).to receive(:retrieve).once
       @ensurable_resource.retrieve_resource
     end
 
     it "should not retrieve the ensure value if specified" do
       @ensurable_resource = Puppet::Type.type(:service).new(:name => "DummyService", :enable => true)
-      @ensurable_resource.properties.each { |prop| prop.stubs(:retrieve) }
-      Puppet::Type::Service::Ensure.any_instance.expects(:retrieve).never
+      @ensurable_resource.properties.each { |prop| allow(prop).to receive(:retrieve) }
+      expect_any_instance_of(Puppet::Type::Service::Ensure).not_to receive(:retrieve)
       @ensurable_resource.retrieve_resource
     end
 
     it "should fail if its provider is unsuitable" do
       @resource = klass.new(:name => "foo", :fstype => "bar", :pass => 1, :ensure => :present)
-      @resource.provider.class.expects(:suitable?).returns false
+      expect(@resource.provider.class).to receive(:suitable?).and_return(false)
       expect { @resource.retrieve_resource }.to raise_error(Puppet::Error)
     end
 
@@ -936,14 +935,14 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should not call retrieve on non-ensure properties if the resource is absent and should consider the property absent" do
-      @resource.property(:ensure).expects(:retrieve).returns :absent
-      @resource.property(:fstype).expects(:retrieve).never
+      expect(@resource.property(:ensure)).to receive(:retrieve).and_return(:absent)
+      expect(@resource.property(:fstype)).not_to receive(:retrieve)
       expect(@resource.retrieve_resource[:fstype]).to eq(:absent)
     end
 
     it "should include the result of retrieving each property's current value if the resource is present" do
-      @resource.property(:ensure).expects(:retrieve).returns :present
-      @resource.property(:fstype).expects(:retrieve).returns 15
+      expect(@resource.property(:ensure)).to receive(:retrieve).and_return(:present)
+      expect(@resource.property(:fstype)).to receive(:retrieve).and_return(15)
       @resource.retrieve_resource[:fstype] == 15
     end
   end
@@ -962,8 +961,8 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
       expect(type_resource.parameters[:remounts]).not_to be_a(Puppet::Property)
       expect(type_resource.parameters[:fstype].is_a?(Puppet::Property)).to be_truthy
 
-      type_resource.property(:ensure).expects(:retrieve).returns :present
-      type_resource.property(:fstype).expects(:retrieve).returns 15
+      expect(type_resource.property(:ensure)).to receive(:retrieve).and_return(:present)
+      expect(type_resource.property(:fstype)).to receive(:retrieve).and_return(15)
 
       resource = type_resource.to_resource
 
@@ -978,7 +977,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     describe "when there's one namevar" do
       before do
         @type_class = Puppet::Type.type(:notify)
-        @type_class.stubs(:key_attributes).returns([:one])
+        allow(@type_class).to receive(:key_attributes).and_return([:one])
       end
 
       it "should have a default pattern for when there's one namevar" do
@@ -1033,7 +1032,7 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     let(:provider) { resource.provider }
 
     it "should be suitable if its type doesn't use providers" do
-      type.stubs(:paramclass).with(:provider).returns nil
+      allow(type).to receive(:paramclass).with(:provider).and_return(nil)
       expect(resource).to be_suitable
     end
 
@@ -1042,18 +1041,18 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     end
 
     it "should not be suitable if it has a provider which is not suitable" do
-      provider.class.stubs(:suitable?).returns false
+      allow(provider.class).to receive(:suitable?).and_return(false)
       expect(resource).not_to be_suitable
     end
 
     it "should be suitable if it does not have a provider and there is a default provider" do
-      resource.stubs(:provider).returns nil
+      allow(resource).to receive(:provider).and_return(nil)
       expect(resource).to be_suitable
     end
 
     it "should not be suitable if it doesn't have a provider and there is not default provider" do
-      resource.stubs(:provider).returns nil
-      type.stubs(:defaultprovider).returns nil
+      allow(resource).to receive(:provider).and_return(nil)
+      allow(type).to receive(:defaultprovider).and_return(nil)
 
       expect(resource).not_to be_suitable
     end
@@ -1185,27 +1184,29 @@ describe Puppet::Type::RelationshipMetaparam do
   end
 
   it "should be able to validate relationships" do
-    expect(Puppet::Type.metaparamclass(:require).new(:resource => mock("resource"))).to respond_to(:validate_relationship)
+    expect(Puppet::Type.metaparamclass(:require).new(:resource => double("resource"))).to respond_to(:validate_relationship)
   end
 
   describe 'if any specified resource is not in the catalog' do
-    let(:catalog) { mock 'catalog' }
+    let(:catalog) { double('catalog') }
 
     let(:resource) do
-      stub 'resource',
+      double(
+        'resource',
         :catalog => catalog,
         :ref     => 'resource',
         :line=   => nil,
         :line    => nil,
         :file=   => nil,
         :file    => nil
+      )
     end
 
     let(:param) { Puppet::Type.metaparamclass(:require).new(:resource => resource, :value => %w{Foo[bar] Class[test]}) }
 
     before do
-      catalog.expects(:resource).with("Foo[bar]").returns "something"
-      catalog.expects(:resource).with("Class[Test]").returns nil
+      expect(catalog).to receive(:resource).with("Foo[bar]").and_return("something")
+      expect(catalog).to receive(:resource).with("Class[Test]").and_return(nil)
     end
 
     describe "and the resource doesn't have a file or line number" do
@@ -1219,8 +1220,8 @@ describe Puppet::Type::RelationshipMetaparam do
 
     describe "and the resource has a file or line number" do
       before do
-        resource.stubs(:line).returns '42'
-        resource.stubs(:file).returns '/hitchhikers/guide/to/the/galaxy'
+        allow(resource).to receive(:line).and_return('42')
+        allow(resource).to receive(:file).and_return('/hitchhikers/guide/to/the/galaxy')
       end
 
       it "raises an error with context" do
@@ -1280,8 +1281,8 @@ describe Puppet::Type.metaparamclass(:audit) do
 
   describe "when generating the uniqueness key" do
     it "should include all of the key_attributes in alphabetical order by attribute name" do
-      Puppet::Type.type(:file).stubs(:key_attributes).returns [:path, :mode, :owner]
-      Puppet::Type.type(:file).stubs(:title_patterns).returns(
+      allow(Puppet::Type.type(:file)).to receive(:key_attributes).and_return([:path, :mode, :owner])
+      allow(Puppet::Type.type(:file)).to receive(:title_patterns).and_return(
         [ [ /(.*)/, [ [:path, lambda{|x| x} ] ] ] ]
       )
       myfile = make_absolute('/my/file')