puppet 6.0.7-x86-mingw32 → 6.0.8-x86-mingw32

data/spec/unit/provider/nameservice/directoryservice_spec.rb

@@ -7,8 +7,8 @@ end
 [:group].each do |type_for_this_round|
   describe Puppet::Type.type(type_for_this_round).provider(:directoryservice) do
     before do
-      @resource = stub("resource")
-      @resource.stubs(:[]).with(:name)
+      @resource = double("resource")
+      allow(@resource).to receive(:[]).with(:name)
       @provider = described_class.new(@resource)
     end
 
@@ -17,18 +17,18 @@ end
       desired = ["foo", ["quux"], "qorp"]
       group   = 'example'
 
-      @resource.stubs(:[]).with(:name).returns(group)
-      @resource.stubs(:[]).with(:auth_membership).returns(true)
+      allow(@resource).to receive(:[]).with(:name).and_return(group)
+      allow(@resource).to receive(:[]).with(:auth_membership).and_return(true)
       @provider.instance_variable_set(:@property_value_cache_hash,
                                       { :members => current })
 
       %w{bar baz}.each do |del|
-        @provider.expects(:execute).once.
+        expect(@provider).to receive(:execute).once.
           with([:dseditgroup, '-o', 'edit', '-n', '.', '-d', del, group])
       end
 
       %w{quux qorp}.each do |add|
-        @provider.expects(:execute).once.
+        expect(@provider).to receive(:execute).once.
           with([:dseditgroup, '-o', 'edit', '-n', '.', '-a', add, group])
       end
 
@@ -40,13 +40,13 @@ end
 describe Puppet::Provider::NameService::DirectoryService do
   context '.single_report' do
     it 'should use plist data' do
-      Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
-      Puppet::Provider::NameService::DirectoryService.stubs(:list_all_present).returns(
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:get_ds_path).and_return('Users')
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:list_all_present).and_return(
         ['root', 'user1', 'user2', 'resource_name']
       )
-      Puppet::Provider::NameService::DirectoryService.stubs(:generate_attribute_hash)
-      Puppet::Provider::NameService::DirectoryService.stubs(:execute)
-      Puppet::Provider::NameService::DirectoryService.expects(:parse_dscl_plist_data)
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:generate_attribute_hash)
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:execute)
+      expect(Puppet::Provider::NameService::DirectoryService).to receive(:parse_dscl_plist_data)
 
       Puppet::Provider::NameService::DirectoryService.single_report('resource_name')
     end
@@ -54,7 +54,7 @@ describe Puppet::Provider::NameService::DirectoryService do
 
   context '.get_exec_preamble' do
     it 'should use plist data' do
-      Puppet::Provider::NameService::DirectoryService.stubs(:get_ds_path).returns('Users')
+      allow(Puppet::Provider::NameService::DirectoryService).to receive(:get_ds_path).and_return('Users')
 
       expect(Puppet::Provider::NameService::DirectoryService.get_exec_preamble('-list')).to include("-plist")
     end
@@ -85,9 +85,9 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     it 'should execute convert_binary_to_hash once when getting the password' do
-      described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
-      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-      Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
+      expect(described_class).to receive(:convert_binary_to_hash).and_return({'SALTED-SHA512' => pw_string})
+      expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
+      expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return(shadow_hash_data)
       described_class.get_password('uid', 'jeff')
     end
 
@@ -98,19 +98,19 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     it 'should convert xml-to-binary and binary-to-xml when setting the pw on >= 10.7' do
-      described_class.expects(:convert_binary_to_hash).returns({'SALTED-SHA512' => pw_string})
-      described_class.expects(:convert_hash_to_binary).returns(binary_plist)
-      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-      Puppet::Util::Plist.expects(:read_plist_file).returns(shadow_hash_data)
-      Puppet::Util::Plist.expects(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
+      expect(described_class).to receive(:convert_binary_to_hash).and_return({'SALTED-SHA512' => pw_string})
+      expect(described_class).to receive(:convert_hash_to_binary).and_return(binary_plist)
+      expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
+      expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return(shadow_hash_data)
+      expect(Puppet::Util::Plist).to receive(:write_plist_file).with(shadow_hash_data, plist_path, :binary)
       described_class.set_password('jeff', 'uid', sha512_hash)
     end
 
     it '[#13686] should handle an empty ShadowHashData field in the users plist' do
-      described_class.expects(:convert_hash_to_binary).returns(binary_plist)
-      Puppet::FileSystem.expects(:exist?).with(plist_path).once.returns(true)
-      Puppet::Util::Plist.expects(:read_plist_file).returns({'ShadowHashData' => nil})
-      Puppet::Util::Plist.expects(:write_plist_file)
+      expect(described_class).to receive(:convert_hash_to_binary).and_return(binary_plist)
+      expect(Puppet::FileSystem).to receive(:exist?).with(plist_path).once.and_return(true)
+      expect(Puppet::Util::Plist).to receive(:read_plist_file).and_return({'ShadowHashData' => nil})
+      expect(Puppet::Util::Plist).to receive(:write_plist_file)
       described_class.set_password('jeff', 'uid', sha512_hash)
     end
   end
@@ -129,7 +129,7 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     let :stub_resource do
-      stub('resource')
+      double('resource')
     end
 
     subject do
@@ -137,21 +137,20 @@ describe Puppet::Provider::NameService::DirectoryService do
     end
 
     before :each do
-      @resource = stub("resource")
-      @resource.stubs(:[]).with(:name)
+      @resource = double("resource")
+      allow(@resource).to receive(:[]).with(:name)
       @provider = provider_class.new(@resource)
     end
 
     it 'should delete a group member if the user does not exist' do
-      stub_resource.stubs(:[]).with(:name).returns('fake_group')
-      stub_resource.stubs(:name).returns('fake_group')
-      subject.expects(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
-                                    '-d', 'jeff',
-                                    'fake_group']).raises(Puppet::ExecutionFailure,
-                                    'it broke')
-      subject.expects(:execute).with([:dscl, '.', '-delete',
-                                    '/Groups/fake_group', 'GroupMembership',
-                                    'jeff'])
+      allow(stub_resource).to receive(:[]).with(:name).and_return('fake_group')
+      allow(stub_resource).to receive(:name).and_return('fake_group')
+      expect(subject).to receive(:execute).with([:dseditgroup, '-o', 'edit', '-n', '.',
+                                                '-d', 'jeff',
+                                                'fake_group']).and_raise(Puppet::ExecutionFailure, 'it broke')
+      expect(subject).to receive(:execute).with([:dscl, '.', '-delete',
+                                                '/Groups/fake_group', 'GroupMembership',
+                                                'jeff'])
       subject.remove_unwanted_members(group_members, user_account)
     end
   end

data/spec/unit/provider/nameservice_spec.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 require 'spec_helper'
 require 'puppet/provider/nameservice'
 require 'puppet/etc'
@@ -134,7 +132,7 @@ describe Puppet::Provider::NameService do
 
   describe "#section" do
     it "should raise an error if resource_type has not been set" do
-      described_class.expects(:resource_type).returns nil
+      expect(described_class).to receive(:resource_type).and_return(nil)
       expect { described_class.section }.to raise_error Puppet::Error, 'Cannot determine Etc section without a resource type'
     end
 
@@ -153,15 +151,15 @@ describe Puppet::Provider::NameService do
 
   describe "#listbyname" do
     it "should be deprecated" do
-      Puppet.expects(:deprecation_warning).with(regexp_matches(/listbyname is deprecated/))
+      expect(Puppet).to receive(:deprecation_warning).with(/listbyname is deprecated/)
       described_class.listbyname
     end
 
     it "should return a list of users if resource_type is user" do
       described_class.resource_type = Puppet::Type.type(:user)
-      Puppet::Etc.expects(:setpwent)
-      Puppet::Etc.stubs(:getpwent).returns(*users)
-      Puppet::Etc.expects(:endpwent)
+      expect(Puppet::Etc).to receive(:setpwent)
+      allow(Puppet::Etc).to receive(:getpwent).and_return(*users)
+      expect(Puppet::Etc).to receive(:endpwent)
       expect(described_class.listbyname).to eq(%w{root foo})
     end
 
@@ -172,7 +170,7 @@ describe Puppet::Provider::NameService do
       # the same name on disk, but each name is stored on disk in a different
       # encoding
       it "should return names with invalid byte sequences replaced with '?'" do
-        Etc.stubs(:getpwent).returns(*utf_8_mixed_users)
+        allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
         expect(invalid_utf_8_jose).to_not be_valid_encoding
         result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
           described_class.listbyname
@@ -181,7 +179,7 @@ describe Puppet::Provider::NameService do
       end
 
       it "should return names in their original encoding/bytes if they would not be valid UTF-8" do
-        Etc.stubs(:getpwent).returns(*latin_1_mixed_users)
+        allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
         result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
           described_class.listbyname
         end
@@ -191,18 +189,18 @@ describe Puppet::Provider::NameService do
 
     it "should return a list of groups if resource_type is group", :unless => Puppet::Util::Platform.windows? do
       described_class.resource_type = Puppet::Type.type(:group)
-      Puppet::Etc.expects(:setgrent)
-      Puppet::Etc.stubs(:getgrent).returns(*groups)
-      Puppet::Etc.expects(:endgrent)
+      expect(Puppet::Etc).to receive(:setgrent)
+      allow(Puppet::Etc).to receive(:getgrent).and_return(*groups)
+      expect(Puppet::Etc).to receive(:endgrent)
       expect(described_class.listbyname).to eq(%w{root bin})
     end
 
     it "should yield if a block given" do
       yield_results = []
       described_class.resource_type = Puppet::Type.type(:user)
-      Puppet::Etc.expects(:setpwent)
-      Puppet::Etc.stubs(:getpwent).returns(*users)
-      Puppet::Etc.expects(:endpwent)
+      expect(Puppet::Etc).to receive(:setpwent)
+      allow(Puppet::Etc).to receive(:getpwent).and_return(*users)
+      expect(Puppet::Etc).to receive(:endpwent)
       described_class.listbyname {|x| yield_results << x }
       expect(yield_results).to eq(%w{root foo})
     end
@@ -213,7 +211,7 @@ describe Puppet::Provider::NameService do
       # These two tests simulate an environment where there are two users with
       # the same name on disk, but each name is stored on disk in a different
       # encoding
-      Etc.stubs(:getpwent).returns(*utf_8_mixed_users)
+      allow(Etc).to receive(:getpwent).and_return(*utf_8_mixed_users)
       result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::UTF_8) do
         described_class.instances
       end
@@ -228,7 +226,7 @@ describe Puppet::Provider::NameService do
     end
 
     it "should have object names in their original encoding/bytes if they would not be valid UTF-8" do
-      Etc.stubs(:getpwent).returns(*latin_1_mixed_users)
+      allow(Etc).to receive(:getpwent).and_return(*latin_1_mixed_users)
       result = PuppetSpec::CharacterEncoding.with_external_encoding(Encoding::ISO_8859_1) do
         described_class.instances
       end
@@ -244,8 +242,8 @@ describe Puppet::Provider::NameService do
 
     it "should pass the Puppet::Etc :canonical_name Struct member to the constructor" do
       users = [ Struct::Passwd.new(invalid_utf_8_jose, invalid_utf_8_jose, 1002, 2000), nil ]
-      Etc.stubs(:getpwent).returns(*users)
-      described_class.expects(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
+      allow(Etc).to receive(:getpwent).and_return(*users)
+      expect(described_class).to receive(:new).with(:name => escaped_utf_8_jose, :canonical_name => invalid_utf_8_jose, :ensure => :present)
       described_class.instances
     end
   end
@@ -278,19 +276,19 @@ describe Puppet::Provider::NameService do
   describe "getinfo" do
     before :each do
       # with section=foo we'll call Etc.getfoonam instead of getpwnam or getgrnam
-      described_class.stubs(:section).returns 'foo'
+      allow(described_class).to receive(:section).and_return('foo')
       resource # initialize the resource so our provider has a @resource instance variable
     end
 
     it "should return a hash if we can retrieve something" do
-      Puppet::Etc.expects(:send).with(:getfoonam, 'bob').returns fakeetcobject
-      provider.expects(:info2hash).with(fakeetcobject).returns(:foo => 'fooval', :bar => 'barval')
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'bob').and_return(fakeetcobject)
+      expect(provider).to receive(:info2hash).with(fakeetcobject).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider.getinfo(true)).to eq({:foo => 'fooval', :bar => 'barval'})
     end
 
     it "should return nil if we cannot retrieve anything" do
-      Puppet::Etc.expects(:send).with(:getfoonam, 'bob').raises(ArgumentError, "can't find bob")
-      provider.expects(:info2hash).never
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'bob').and_raise(ArgumentError, "can't find bob")
+      expect(provider).not_to receive(:info2hash)
       expect(provider.getinfo(true)).to be_nil
     end
 
@@ -299,13 +297,13 @@ describe Puppet::Provider::NameService do
     # again if needed
     it "should use the instance's @canonical_name to query the system" do
       provider_instance = described_class.new(:name => 'foo', :canonical_name => 'original_foo', :ensure => :present)
-      Puppet::Etc.expects(:send).with(:getfoonam, 'original_foo')
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'original_foo')
       provider_instance.getinfo(true)
     end
 
     it "should use the instance's name instead of canonical_name if not supplied during instantiation" do
       provider_instance = described_class.new(:name => 'foo', :ensure => :present)
-      Puppet::Etc.expects(:send).with(:getfoonam, 'foo')
+      expect(Puppet::Etc).to receive(:send).with(:getfoonam, 'foo')
       provider_instance.getinfo(true)
     end
   end
@@ -319,9 +317,9 @@ describe Puppet::Provider::NameService do
       # expect two method invocations because info2hash calls the method
       # twice if the Struct responds to the propertyname (our fake Struct
       # provides values for :foo and :bar) TODO: Fix that
-      provider.expects(:posixmethod).with(:foo).returns(:foo).twice
-      provider.expects(:posixmethod).with(:bar).returns(:bar).twice
-      provider.expects(:posixmethod).with(:ensure).returns :ensure
+      expect(provider).to receive(:posixmethod).with(:foo).and_return(:foo).twice
+      expect(provider).to receive(:posixmethod).with(:bar).and_return(:bar).twice
+      expect(provider).to receive(:posixmethod).with(:ensure).and_return(:ensure)
       expect(provider.info2hash(fakeetcobject)).to eq({ :foo => 'fooval', :bar => 'barval' })
     end
   end
@@ -351,11 +349,11 @@ describe Puppet::Provider::NameService do
 
   describe "exists?" do
     it "should return true if we can retrieve anything" do
-      provider.expects(:getinfo).with(true).returns(:foo => 'fooval', :bar => 'barval')
+      expect(provider).to receive(:getinfo).with(true).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider).to be_exists
     end
     it "should return false if we cannot retrieve anything" do
-      provider.expects(:getinfo).with(true).returns nil
+      expect(provider).to receive(:getinfo).with(true).and_return(nil)
       expect(provider).not_to be_exists
     end
   end
@@ -364,18 +362,18 @@ describe Puppet::Provider::NameService do
     before(:each) {described_class.resource_type = faketype }
 
     it "should return the correct getinfo value" do
-      provider.expects(:getinfo).with(false).returns(:foo => 'fooval', :bar => 'barval')
+      expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider.get(:bar)).to eq('barval')
     end
 
     it "should unmunge the value first" do
       described_class.options(:bar, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
-      provider.expects(:getinfo).with(false).returns(:foo => 200, :bar => 500)
+      expect(provider).to receive(:getinfo).with(false).and_return(:foo => 200, :bar => 500)
       expect(provider.get(:bar)).to eq(250)
     end
 
     it "should return nil if getinfo cannot retrieve the value" do
-      provider.expects(:getinfo).with(false).returns(:foo => 'fooval', :bar => 'barval')
+      expect(provider).to receive(:getinfo).with(false).and_return(:foo => 'fooval', :bar => 'barval')
       expect(provider.get(:no_such_key)).to be_nil
     end
 
@@ -392,21 +390,21 @@ describe Puppet::Provider::NameService do
     end
 
     it "should execute the modify command on valid values" do
-      provider.expects(:modifycmd).with(:foo, 100).returns ['/bin/modify', '-f', '100' ]
-      provider.expects(:execute).with(['/bin/modify', '-f', '100'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:modifycmd).with(:foo, 100).and_return(['/bin/modify', '-f', '100' ])
+      expect(provider).to receive(:execute).with(['/bin/modify', '-f', '100'], hash_including(custom_environment: {}))
       provider.set(:foo, 100)
     end
 
     it "should munge the value first" do
       described_class.options(:foo, :munge => proc { |x| x*2}, :unmunge => proc {|x| x/2})
-      provider.expects(:modifycmd).with(:foo, 200).returns(['/bin/modify', '-f', '200' ])
-      provider.expects(:execute).with(['/bin/modify', '-f', '200'], has_entry(:custom_environment, {}))
+      expect(provider).to receive(:modifycmd).with(:foo, 200).and_return(['/bin/modify', '-f', '200' ])
+      expect(provider).to receive(:execute).with(['/bin/modify', '-f', '200'], hash_including(custom_environment: {}))
       provider.set(:foo, 100)
     end
 
     it "should fail if the modify command fails" do
-      provider.expects(:modifycmd).with(:foo, 100).returns(['/bin/modify', '-f', '100' ])
-      provider.expects(:execute).with(['/bin/modify', '-f', '100'], kind_of(Hash)).raises(Puppet::ExecutionFailure, "Execution of '/bin/modify' returned 1: some_failure")
+      expect(provider).to receive(:modifycmd).with(:foo, 100).and_return(['/bin/modify', '-f', '100' ])
+      expect(provider).to receive(:execute).with(['/bin/modify', '-f', '100'], kind_of(Hash)).and_raise(Puppet::ExecutionFailure, "Execution of '/bin/modify' returned 1: some_failure")
       expect { provider.set(:foo, 100) }.to raise_error Puppet::Error, /Could not set foo/
     end
   end

data/spec/unit/provider/package/aix_spec.rb

@@ -15,26 +15,26 @@ describe Puppet::Type.type(:package).provider(:aix) do
   end
 
   it "should uninstall a package" do
-    @provider.expects(:installp).with('-gu', 'mypackage')
-    @provider.class.expects(:pkglist).with(:pkgname => 'mypackage').returns(nil)
+    expect(@provider).to receive(:installp).with('-gu', 'mypackage')
+    expect(@provider.class).to receive(:pkglist).with(:pkgname => 'mypackage').and_return(nil)
     @provider.uninstall
   end
 
   context "when installing" do
     it "should install a package" do
-      @provider.expects(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage')
+      expect(@provider).to receive(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage')
       @provider.install
     end
 
     it "should install a specific package version" do
-      @resource.stubs(:should).with(:ensure).returns("1.2.3.4")
-      @provider.expects(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage 1.2.3.4')
+      allow(@resource).to receive(:should).with(:ensure).and_return("1.2.3.4")
+      expect(@provider).to receive(:installp).with('-acgwXY', '-d', 'mysource', 'mypackage 1.2.3.4')
       @provider.install
     end
 
     it "should fail if the specified version is superseded" do
       @resource[:ensure] = '1.2.3.3'
-      @provider.stubs(:installp).returns <<-OUTPUT
+      allow(@provider).to receive(:installp).and_return(<<-OUTPUT)
 +-----------------------------------------------------------------------------+
                     Pre-installation Verification...
 +-----------------------------------------------------------------------------+
@@ -85,26 +85,26 @@ mypackage                 1.2.3.3         Already superseded by 1.2.3.4
 
   context "when finding the latest version" do
     it "should return the current version when no later version is present" do
-      @provider.stubs(:latest_info).returns(nil)
-      @provider.stubs(:properties).returns( { :ensure => "1.2.3.4" } )
+      allow(@provider).to receive(:latest_info).and_return(nil)
+      allow(@provider).to receive(:properties).and_return({ :ensure => "1.2.3.4" })
       expect(@provider.latest).to eq("1.2.3.4")
     end
 
     it "should return the latest version of a package" do
-      @provider.stubs(:latest_info).returns( { :version => "1.2.3.5" } )
+      allow(@provider).to receive(:latest_info).and_return({ :version => "1.2.3.5" })
       expect(@provider.latest).to eq("1.2.3.5")
     end
 
     it "should prefetch the right values" do
-      Process.stubs(:euid).returns(0)
+      allow(Process).to receive(:euid).and_return(0)
       resource = Puppet::Type.type(:package).
           new(:name => 'sudo.rte', :ensure => :latest,
               :source => 'mysource', :provider => :aix)
 
-      resource.stubs(:should).with(:ensure).returns(:latest)
+      allow(resource).to receive(:should).with(:ensure).and_return(:latest)
       resource.should(:ensure)
 
-      resource.provider.class.stubs(:execute).returns(<<-END.chomp)
+      allow(resource.provider.class).to receive(:execute).and_return(<<-END.chomp)
 sudo:sudo.rte:1.7.10.4::I:C:::::N:Configurable super-user privileges runtime::::0::
 sudo:sudo.rte:1.8.6.4::I:T:::::N:Configurable super-user privileges runtime::::0::
 END
@@ -115,15 +115,15 @@ END
   end
 
   it "update should install a package" do
-    @provider.expects(:install).with(false)
+    expect(@provider).to receive(:install).with(false)
     @provider.update
   end
 
   it "should prefetch when some packages lack sources" do
     latest = Puppet::Type.type(:package).new(:name => 'mypackage', :ensure => :latest, :source => 'mysource', :provider => :aix)
     absent = Puppet::Type.type(:package).new(:name => 'otherpackage', :ensure => :absent, :provider => :aix)
-    Process.stubs(:euid).returns(0)
-    described_class.expects(:execute).returns 'mypackage:mypackage.rte:1.8.6.4::I:T:::::N:A Super Cool Package::::0::\n'
+    allow(Process).to receive(:euid).and_return(0)
+    expect(described_class).to receive(:execute).and_return('mypackage:mypackage.rte:1.8.6.4::I:T:::::N:A Super Cool Package::::0::\n')
     described_class.prefetch({ 'mypackage' => latest, 'otherpackage' => absent })
   end
 end

data/spec/unit/provider/package/appdmg_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 describe Puppet::Type.type(:package).provider(:appdmg) do
@@ -10,12 +9,11 @@ describe Puppet::Type.type(:package).provider(:appdmg) do
     let(:fake_hdiutil_plist) { {"system-entities" => [{"mount-point" => fake_mountpoint}]} }
 
     before do
-      fh = mock 'filehandle'
-      fh.stubs(:path).yields "/tmp/foo"
+      fh = double('filehandle', path: '/tmp/foo')
       resource[:source] = "foo.dmg"
-      described_class.stubs(:open).yields fh
-      Dir.stubs(:mktmpdir).returns "/tmp/testtmp123"
-      FileUtils.stubs(:remove_entry_secure)
+      allow(described_class).to receive(:open).and_yield(fh)
+      allow(Dir).to receive(:mktmpdir).and_return("/tmp/testtmp123")
+      allow(FileUtils).to receive(:remove_entry_secure)
     end
 
     describe "from a remote source" do
@@ -26,14 +24,16 @@ describe Puppet::Type.type(:package).provider(:appdmg) do
       end
 
       it "should call tmpdir and use the returned directory" do
-        Dir.expects(:mktmpdir).returns tmpdir
-        Dir.stubs(:entries).returns ["foo.app"]
-        described_class.expects(:curl).with do |*args|
-          args[0] == "-o" && args[1].include?(tmpdir) && ! args.include?("-k")
+        expect(Dir).to receive(:mktmpdir).and_return(tmpdir)
+        allow(Dir).to receive(:entries).and_return(["foo.app"])
+        expect(described_class).to receive(:curl) do |*args|
+          expect(args[0]).to eq("-o")
+          expect(args[1]).to include(tmpdir)
+          expect(args).not_to include("-k")
         end
-        described_class.stubs(:hdiutil).returns 'a plist'
-        Puppet::Util::Plist.expects(:parse_plist).with('a plist').returns fake_hdiutil_plist
-        described_class.expects(:installapp)
+        allow(described_class).to receive(:hdiutil).and_return('a plist')
+        expect(Puppet::Util::Plist).to receive(:parse_plist).with('a plist').and_return(fake_hdiutil_plist)
+        expect(described_class).to receive(:installapp)
 
         provider.install
       end