puppet 5.5.12-x64-mingw32 → 5.5.13-x64-mingw32

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 
 describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.features.microsoft_windows? do
@@ -11,39 +9,37 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
   end
 
   let(:provider) { resource.provider }
-
-  let(:connection) { stub 'connection' }
+  let(:connection) { double('connection') }
 
   before :each do
-    Puppet::Util::Windows::ADSI.stubs(:computer_name).returns('testcomputername')
-    Puppet::Util::Windows::ADSI.stubs(:connect).returns connection
+    allow(Puppet::Util::Windows::ADSI).to receive(:computer_name).and_return('testcomputername')
+    allow(Puppet::Util::Windows::ADSI).to receive(:connect).and_return(connection)
     # this would normally query the system, but not needed for these tests
-    Puppet::Util::Windows::ADSI::Group.stubs(:localized_domains).returns([])
+    allow(Puppet::Util::Windows::ADSI::Group).to receive(:localized_domains).and_return([])
   end
 
   describe ".instances" do
     it "should enumerate all groups" do
       names = ['group1', 'group2', 'group3']
-      stub_groups = names.map{|n| stub(:name => n)}
+      stub_groups = names.map{|n| double(:name => n)}
 
-      connection.stubs(:execquery).with('select name from win32_group where localaccount = "TRUE"').returns stub_groups
+      allow(connection).to receive(:execquery).with('select name from win32_group where localaccount = "TRUE"').and_return(stub_groups)
 
       expect(described_class.instances.map(&:name)).to match(names)
     end
   end
 
   describe "group type :members property helpers" do
-
-    let(:user1) { stub(:account => 'user1', :domain => '.', :sid => 'user1sid') }
-    let(:user2) { stub(:account => 'user2', :domain => '.', :sid => 'user2sid') }
-    let(:user3) { stub(:account => 'user3', :domain => '.', :sid => 'user3sid') }
+    let(:user1) { double(:account => 'user1', :domain => '.', :sid => 'user1sid') }
+    let(:user2) { double(:account => 'user2', :domain => '.', :sid => 'user2sid') }
+    let(:user3) { double(:account => 'user3', :domain => '.', :sid => 'user3sid') }
     let(:invalid_user) { SecureRandom.uuid }
 
     before :each do
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user1').returns(user1)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user2').returns(user2)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user3').returns(user3)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with(invalid_user).returns(nil)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user1').and_return(user1)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2').and_return(user2)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user3').and_return(user3)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with(invalid_user).and_return(nil)
     end
 
     describe "#members_insync?" do
@@ -212,19 +208,24 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
           expect(provider.members_to_s(input)).to be_empty
         end
       end
+
       it "should return an empty string on empty or nil users" do
         expect(provider.members_to_s([])).to be_empty
         expect(provider.members_to_s(nil)).to be_empty
       end
+
       it "should return a user string like DOMAIN\\USER" do
         expect(provider.members_to_s(['user1'])).to eq('.\user1')
       end
+
       it "should return a user string like DOMAIN\\USER,DOMAIN2\\USER2" do
         expect(provider.members_to_s(['user1', 'user2'])).to eq('.\user1,.\user2')
       end
+
       it "should return the username when it cannot be resolved to a SID (for the sake of resource_harness error messages)" do
         expect(provider.members_to_s([invalid_user])).to eq("#{invalid_user}")
       end
+
       it "should return the username when it cannot be resolved to a SID (for the sake of resource_harness error messages)" do
         expect(provider.members_to_s([invalid_user])).to eq("#{invalid_user}")
       end
@@ -232,50 +233,50 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
   end
 
   describe "when managing members" do
-    let(:user1) { stub(:account => 'user1', :domain => '.', :sid => 'user1sid') }
-    let(:user2) { stub(:account => 'user2', :domain => '.', :sid => 'user2sid') }
-    let(:user3) { stub(:account => 'user3', :domain => '.', :sid => 'user3sid') }
+    let(:user1) { double(:account => 'user1', :domain => '.', :sid => 'user1sid') }
+    let(:user2) { double(:account => 'user2', :domain => '.', :sid => 'user2sid') }
+    let(:user3) { double(:account => 'user3', :domain => '.', :sid => 'user3sid') }
 
     before :each do
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user1').returns(user1)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user2').returns(user2)
-      Puppet::Util::Windows::SID.stubs(:name_to_principal).with('user3').returns(user3)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user1').and_return(user1)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2').and_return(user2)
+      allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user3').and_return(user3)
 
       resource[:auth_membership] = true
     end
 
     it "should be able to provide a list of members" do
-      provider.group.stubs(:members).returns [
+      allow(provider.group).to receive(:members).and_return([
         'user1',
         'user2',
         'user3',
-      ]
+      ])
 
       expected_member_sids = [user1.sid, user2.sid, user3.sid]
       expected_members = ['user1', 'user2', 'user3']
-      provider.stubs(:members_to_s)
+      allow(provider).to receive(:members_to_s)
         .with(expected_member_sids)
-        .returns(expected_members.join(','))
+        .and_return(expected_members.join(','))
 
       expect(provider.members).to match_array(expected_members)
     end
 
     it "should be able to set group members" do
-      provider.group.stubs(:members).returns ['user1', 'user2']
+      allow(provider.group).to receive(:members).and_return(['user1', 'user2'])
 
       member_sids = [
-        stub(:account => 'user1', :domain => 'testcomputername', :sid => 1),
-        stub(:account => 'user2', :domain => 'testcomputername', :sid => 2),
-        stub(:account => 'user3', :domain => 'testcomputername', :sid => 3),
+        double(:account => 'user1', :domain => 'testcomputername', :sid => 1),
+        double(:account => 'user2', :domain => 'testcomputername', :sid => 2),
+        double(:account => 'user3', :domain => 'testcomputername', :sid => 3),
       ]
 
-      provider.group.stubs(:member_sids).returns(member_sids[0..1])
+      allow(provider.group).to receive(:member_sids).and_return(member_sids[0..1])
 
-      Puppet::Util::Windows::SID.expects(:name_to_principal).with('user2').returns(member_sids[1])
-      Puppet::Util::Windows::SID.expects(:name_to_principal).with('user3').returns(member_sids[2])
+      expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user2').and_return(member_sids[1])
+      expect(Puppet::Util::Windows::SID).to receive(:name_to_principal).with('user3').and_return(member_sids[2])
 
-      provider.group.expects(:remove_member_sids).with(member_sids[0])
-      provider.group.expects(:add_member_sids).with(member_sids[2])
+      expect(provider.group).to receive(:remove_member_sids).with(member_sids[0])
+      expect(provider.group).to receive(:add_member_sids).with(member_sids[2])
 
       provider.members = ['user2', 'user3']
     end
@@ -285,69 +286,68 @@ describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.featur
     it "should be able to create a group" do
       resource[:members] = ['user1', 'user2']
 
-      group = stub 'group'
-      Puppet::Util::Windows::ADSI::Group.expects(:create).with('testers').returns group
+      group = double('group')
+      expect(Puppet::Util::Windows::ADSI::Group).to receive(:create).with('testers').and_return(group)
 
-      create = sequence('create')
-      group.expects(:commit).in_sequence(create)
+      expect(group).to receive(:commit).ordered
       # due to PUP-1967, defaultto false will set the default to nil
-      group.expects(:set_members).with(['user1', 'user2'], nil).in_sequence(create)
+      expect(group).to receive(:set_members).with(['user1', 'user2'], nil).ordered
 
       provider.create
     end
 
     it 'should not create a group if a user by the same name exists' do
-      Puppet::Util::Windows::ADSI::Group.expects(:create).with('testers').raises( Puppet::Error.new("Cannot create group if user 'testers' exists.") )
+      expect(Puppet::Util::Windows::ADSI::Group).to receive(:create).with('testers').and_raise(Puppet::Error.new("Cannot create group if user 'testers' exists."))
       expect{ provider.create }.to raise_error( Puppet::Error,
         /Cannot create group if user 'testers' exists./ )
     end
 
     it "should fail with an actionable message when trying to create an active directory group" do
       resource[:name] = 'DOMAIN\testdomaingroup'
-      Puppet::Util::Windows::ADSI::User.expects(:exists?).with(resource[:name]).returns(false)
-      connection.expects(:Create)
-      connection.expects(:SetInfo).raises( WIN32OLERuntimeError.new("(in OLE method `SetInfo': )\n    OLE error code:8007089A in Active Directory\n      The specified username is invalid.\r\n\n    HRESULT error code:0x80020009\n      Exception occurred."))
+      expect(Puppet::Util::Windows::ADSI::User).to receive(:exists?).with(resource[:name]).and_return(false)
+      expect(connection).to receive(:Create)
+      expect(connection).to receive(:SetInfo).and_raise( WIN32OLERuntimeError.new("(in OLE method `SetInfo': )\n    OLE error code:8007089A in Active Directory\n      The specified username is invalid.\r\n\n    HRESULT error code:0x80020009\n      Exception occurred."))
 
       expect{ provider.create }.to raise_error(Puppet::Error)
     end
 
     it 'should commit a newly created group' do
-      provider.group.expects( :commit )
+      expect(provider.group).to receive( :commit )
 
       provider.flush
     end
   end
 
   it "should be able to test whether a group exists" do
-    Puppet::Util::Windows::SID.stubs(:name_to_principal).returns(nil)
-    Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection', :Class => 'Group')
+    allow(Puppet::Util::Windows::SID).to receive(:name_to_principal).and_return(nil)
+    allow(Puppet::Util::Windows::ADSI).to receive(:connect).and_return(double('connection', :Class => 'Group'))
     expect(provider).to be_exists
 
-    Puppet::Util::Windows::ADSI.stubs(:connect).returns nil
+    allow(Puppet::Util::Windows::ADSI).to receive(:connect).and_return(nil)
     expect(provider).not_to be_exists
   end
 
   it "should be able to delete a group" do
-    connection.expects(:Delete).with('group', 'testers')
+    expect(connection).to receive(:Delete).with('group', 'testers')
 
     provider.delete
   end
 
   it 'should not run commit on a deleted group' do
-    connection.expects(:Delete).with('group', 'testers')
-    connection.expects(:SetInfo).never
+    expect(connection).to receive(:Delete).with('group', 'testers')
+    expect(connection).not_to receive(:SetInfo)
 
     provider.delete
     provider.flush
   end
 
   it "should report the group's SID as gid" do
-    Puppet::Util::Windows::SID.expects(:name_to_sid).with('testers').returns('S-1-5-32-547')
+    expect(Puppet::Util::Windows::SID).to receive(:name_to_sid).with('testers').and_return('S-1-5-32-547')
     expect(provider.gid).to eq('S-1-5-32-547')
   end
 
   it "should fail when trying to manage the gid property" do
-    provider.expects(:fail).with { |msg| msg =~ /gid is read-only/ }
+    expect(provider).to receive(:fail).with(/gid is read-only/)
     provider.send(:gid=, 500)
   end
 

data/spec/unit/provider/host/parsed_spec.rb

@@ -10,7 +10,7 @@ describe Puppet::Type.type(:host).provider(:parsed) do
     @host_class = Puppet::Type.type(:host)
     @provider = @host_class.provider(:parsed)
     @hostfile = tmpfile('hosts')
-    @provider.any_instance.stubs(:target).returns @hostfile
+    allow_any_instance_of(@provider).to receive(:target).and_return(@hostfile)
   end
 
   after :each do
@@ -19,7 +19,7 @@ describe Puppet::Type.type(:host).provider(:parsed) do
 
   def mkhost(args)
     hostresource = Puppet::Type::Host.new(:name => args[:name])
-    hostresource.stubs(:should).with(:target).returns @hostfile
+    allow(hostresource).to receive(:should).with(:target).and_return(@hostfile)
 
     # Using setters of provider to build our testobject
     # Note: We already proved, that in case of host_aliases
@@ -34,10 +34,10 @@ describe Puppet::Type.type(:host).provider(:parsed) do
   end
 
   def genhost(host)
-    @provider.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
-    File.stubs(:chown)
-    File.stubs(:chmod)
-    Puppet::Util::SUIDManager.stubs(:asuser).yields
+    allow(@provider).to receive(:filetype).and_return(Puppet::Util::FileType::FileTypeRam)
+    allow(File).to receive(:chown)
+    allow(File).to receive(:chmod)
+    allow(Puppet::Util::SUIDManager).to receive(:asuser).and_yield
     host.flush
     @provider.target_object(@hostfile).read
   end

data/spec/unit/provider/interface/cisco_spec.rb

@@ -1,55 +1,51 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/provider/interface/cisco'
 
-provider_class = Puppet::Type.type(:interface).provider(:cisco)
-
-describe provider_class do
+describe Puppet::Type.type(:interface).provider(:cisco) do
   before do
-    @device = stub_everything 'device'
-    @resource = stub("resource", :name => "Fa0/1")
-    @provider = provider_class.new(@device, @resource)
+    @device = double('device')
+    @resource = double("resource", :name => "Fa0/1")
+    @provider = described_class.new(@device, @resource)
   end
 
   it "should have a parent of Puppet::Provider::Cisco" do
-    expect(provider_class).to be < Puppet::Provider::Cisco
+    expect(described_class).to be < Puppet::Provider::Cisco
   end
 
   it "should have an instances method" do
-    expect(provider_class).to respond_to(:instances)
+    expect(described_class).to respond_to(:instances)
   end
 
   describe "when looking up instances at prefetch" do
     before do
-      @device.stubs(:command).yields(@device)
+      allow(@device).to receive(:command).and_yield(@device)
     end
 
     it "should delegate to the device interface fetcher" do
-      @device.expects(:interface)
-      provider_class.lookup(@device, "Fa0/1")
+      expect(@device).to receive(:interface)
+      described_class.lookup(@device, "Fa0/1")
     end
 
     it "should return the given interface data" do
-      @device.expects(:interface).returns({ :description => "thisone", :mode => :access})
-      expect(provider_class.lookup(@device, "Fa0")).to eq({:description => "thisone", :mode => :access })
+      expect(@device).to receive(:interface).and_return({:description => "thisone", :mode => :access})
+      expect(described_class.lookup(@device, "Fa0")).to eq({:description => "thisone", :mode => :access })
     end
-
   end
 
   describe "when an instance is being flushed" do
     it "should call the device interface update method with current and past properties" do
-      @instance = provider_class.new(@device, :ensure => :present, :name => "Fa0/1", :description => "myinterface")
+      @instance = described_class.new(@device, :ensure => :present, :name => "Fa0/1", :description => "myinterface")
       @instance.description = "newdesc"
       @instance.resource = @resource
-      @resource.stubs(:[]).with(:name).returns("Fa0/1")
-      device = stub_everything 'device'
-      @instance.stubs(:device).returns(device)
-      device.expects(:command).yields(device)
-      interface = stub 'interface'
-      device.expects(:new_interface).with("Fa0/1").returns(interface)
-      interface.expects(:update).with( {:ensure => :present, :name => "Fa0/1", :description => "myinterface"},
-                                       {:ensure => :present, :name => "Fa0/1", :description => "newdesc"})
+      allow(@resource).to receive(:[]).with(:name).and_return("Fa0/1")
+      device = double('device')
+      allow(@instance).to receive(:device).and_return(device)
+      expect(device).to receive(:command).and_yield(device)
+      interface = double('interface')
+      expect(device).to receive(:new_interface).with("Fa0/1").and_return(interface)
+      expect(interface).to receive(:update).with( {:ensure => :present, :name => "Fa0/1", :description => "myinterface"},
+                                                  {:ensure => :present, :name => "Fa0/1", :description => "newdesc"})
 
       @instance.flush
     end

data/spec/unit/provider/ldap_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/provider/ldap'
@@ -9,10 +8,10 @@ describe Puppet::Provider::Ldap do
   end
 
   it "should be able to define its manager" do
-    manager = mock 'manager'
-    Puppet::Util::Ldap::Manager.expects(:new).returns manager
-    @class.stubs :mk_resource_methods
-    manager.expects(:manages).with(:one)
+    manager = double('manager')
+    expect(Puppet::Util::Ldap::Manager).to receive(:new).and_return(manager)
+    allow(@class).to receive(:mk_resource_methods)
+    expect(manager).to receive(:manages).with(:one)
     expect(@class.manages(:one)).to equal(manager)
     expect(@class.manager).to equal(manager)
   end
@@ -22,10 +21,10 @@ describe Puppet::Provider::Ldap do
   end
 
   it "should create its resource getter/setter methods when the manager is defined" do
-    manager = mock 'manager'
-    Puppet::Util::Ldap::Manager.expects(:new).returns manager
-    @class.expects :mk_resource_methods
-    manager.stubs(:manages)
+    manager = double('manager')
+    expect(Puppet::Util::Ldap::Manager).to receive(:new).and_return(manager)
+    expect(@class).to receive(:mk_resource_methods)
+    allow(manager).to receive(:manages)
     expect(@class.manages(:one)).to equal(manager)
   end
 
@@ -35,14 +34,14 @@ describe Puppet::Provider::Ldap do
 
   describe "when providing a list of instances" do
     it "should convert all results returned from the manager's :search method into provider instances" do
-      manager = mock 'manager'
-      @class.stubs(:manager).returns manager
+      manager = double('manager')
+      allow(@class).to receive(:manager).and_return(manager)
 
-      manager.expects(:search).returns %w{one two three}
+      expect(manager).to receive(:search).and_return(%w{one two three})
 
-      @class.expects(:new).with("one").returns(1)
-      @class.expects(:new).with("two").returns(2)
-      @class.expects(:new).with("three").returns(3)
+      expect(@class).to receive(:new).with("one").and_return(1)
+      expect(@class).to receive(:new).with("two").and_return(2)
+      expect(@class).to receive(:new).with("three").and_return(3)
 
       expect(@class.instances).to eq([1,2,3])
     end
@@ -54,29 +53,29 @@ describe Puppet::Provider::Ldap do
 
   describe "when prefetching" do
     before do
-      @manager = mock 'manager'
-      @class.stubs(:manager).returns @manager
+      @manager = double('manager')
+      allow(@class).to receive(:manager).and_return(@manager)
 
-      @resource = mock 'resource'
+      @resource = double('resource')
 
       @resources = {"one" => @resource}
     end
 
     it "should find an entry for each passed resource" do
-      @manager.expects(:find).with("one").returns nil
+      expect(@manager).to receive(:find).with("one").and_return(nil)
 
-      @class.stubs(:new)
-      @resource.stubs(:provider=)
+      allow(@class).to receive(:new)
+      allow(@resource).to receive(:provider=)
       @class.prefetch(@resources)
     end
 
     describe "resources that do not exist" do
       it "should create a provider with :ensure => :absent" do
-        @manager.expects(:find).with("one").returns nil
+        expect(@manager).to receive(:find).with("one").and_return(nil)
 
-        @class.expects(:new).with(:ensure => :absent).returns "myprovider"
+        expect(@class).to receive(:new).with(:ensure => :absent).and_return("myprovider")
 
-        @resource.expects(:provider=).with("myprovider")
+        expect(@resource).to receive(:provider=).with("myprovider")
 
         @class.prefetch(@resources)
       end
@@ -84,21 +83,21 @@ describe Puppet::Provider::Ldap do
 
     describe "resources that exist" do
       it "should create a provider with the results of the find" do
-        @manager.expects(:find).with("one").returns("one" => "two")
+        expect(@manager).to receive(:find).with("one").and_return("one" => "two")
 
-        @class.expects(:new).with("one" => "two", :ensure => :present).returns "myprovider"
+        expect(@class).to receive(:new).with("one" => "two", :ensure => :present).and_return("myprovider")
 
-        @resource.expects(:provider=).with("myprovider")
+        expect(@resource).to receive(:provider=).with("myprovider")
 
         @class.prefetch(@resources)
       end
 
       it "should set :ensure to :present in the returned values" do
-        @manager.expects(:find).with("one").returns("one" => "two")
+        expect(@manager).to receive(:find).with("one").and_return("one" => "two")
 
-        @class.expects(:new).with("one" => "two", :ensure => :present).returns "myprovider"
+        expect(@class).to receive(:new).with("one" => "two", :ensure => :present).and_return("myprovider")
 
-        @resource.expects(:provider=).with("myprovider")
+        expect(@resource).to receive(:provider=).with("myprovider")
 
         @class.prefetch(@resources)
       end
@@ -111,22 +110,22 @@ describe Puppet::Provider::Ldap do
     end
 
     it "should fail if the manager is invalid" do
-      manager = stub "manager", :valid? => false
-      @class.stubs(:manager).returns manager
+      manager = double("manager", :valid? => false)
+      allow(@class).to receive(:manager).and_return(manager)
       expect { @class.new }.to raise_error(Puppet::DevError)
     end
 
     describe "with a hash" do
       before do
-        @manager = stub "manager", :valid? => true
-        @class.stubs(:manager).returns @manager
+        @manager = double("manager", :valid? => true)
+        allow(@class).to receive(:manager).and_return(@manager)
 
-        @resource_class = mock 'resource_class'
-        @class.stubs(:resource_type).returns @resource_class
+        @resource_class = double('resource_class')
+        allow(@class).to receive(:resource_type).and_return(@resource_class)
 
-        @property_class = stub 'property_class', :array_matching => :all, :superclass => Puppet::Property
-        @resource_class.stubs(:attrclass).with(:one).returns(@property_class)
-        @resource_class.stubs(:valid_parameter?).returns true
+        @property_class = double('property_class', :array_matching => :all, :superclass => Puppet::Property)
+        allow(@resource_class).to receive(:attrclass).with(:one).and_return(@property_class)
+        allow(@resource_class).to receive(:valid_parameter?).and_return(true)
       end
 
       it "should store a copy of the hash as its ldap_properties" do
@@ -135,29 +134,29 @@ describe Puppet::Provider::Ldap do
       end
 
       it "should only store the first value of each value array for those attributes that do not match all values" do
-        @property_class.expects(:array_matching).returns :first
+        expect(@property_class).to receive(:array_matching).and_return(:first)
         instance = @class.new(:one => %w{two three})
         expect(instance.properties).to eq({:one => "two"})
       end
 
       it "should store the whole value array for those attributes that match all values" do
-        @property_class.expects(:array_matching).returns :all
+        expect(@property_class).to receive(:array_matching).and_return(:all)
         instance = @class.new(:one => %w{two three})
         expect(instance.properties).to eq({:one => %w{two three}})
       end
 
       it "should only use the first value for attributes that are not properties" do
         # Yay.  hackish, but easier than mocking everything.
-        @resource_class.expects(:attrclass).with(:a).returns Puppet::Type.type(:user).attrclass(:name)
-        @property_class.stubs(:array_matching).returns :all
+        expect(@resource_class).to receive(:attrclass).with(:a).and_return(Puppet::Type.type(:user).attrclass(:name))
+        allow(@property_class).to receive(:array_matching).and_return(:all)
 
         instance = @class.new(:one => %w{two three}, :a => %w{b c})
         expect(instance.properties).to eq({:one => %w{two three}, :a => "b"})
       end
 
       it "should discard any properties not valid in the resource class" do
-        @resource_class.expects(:valid_parameter?).with(:a).returns false
-        @property_class.stubs(:array_matching).returns :all
+        expect(@resource_class).to receive(:valid_parameter?).with(:a).and_return(false)
+        allow(@property_class).to receive(:array_matching).and_return(:all)
 
         instance = @class.new(:one => %w{two three}, :a => %w{b})
         expect(instance.properties).to eq({:one => %w{two three}})
@@ -167,13 +166,13 @@ describe Puppet::Provider::Ldap do
 
   describe "when an instance" do
     before do
-      @manager = stub "manager", :valid? => true
-      @class.stubs(:manager).returns @manager
+      @manager = double("manager", :valid? => true)
+      allow(@class).to receive(:manager).and_return(@manager)
       @instance = @class.new
 
-      @property_class = stub 'property_class', :array_matching => :all, :superclass => Puppet::Property
-      @resource_class = stub 'resource_class', :attrclass => @property_class, :valid_parameter? => true, :validproperties => [:one, :two]
-      @class.stubs(:resource_type).returns @resource_class
+      @property_class = double('property_class', :array_matching => :all, :superclass => Puppet::Property)
+      @resource_class = double('resource_class', :attrclass => @property_class, :valid_parameter? => true, :validproperties => [:one, :two])
+      allow(@class).to receive(:resource_type).and_return(@resource_class)
     end
 
     it "should have a method for creating the ldap entry" do
@@ -200,22 +199,22 @@ describe Puppet::Provider::Ldap do
 
     describe "is being flushed" do
       it "should call the manager's :update method with its name, current attributes, and desired attributes" do
-        @instance.stubs(:name).returns "myname"
-        @instance.stubs(:ldap_properties).returns(:one => :two)
-        @instance.stubs(:properties).returns(:three => :four)
-        @manager.expects(:update).with(@instance.name, {:one => :two}, {:three => :four})
+        allow(@instance).to receive(:name).and_return("myname")
+        allow(@instance).to receive(:ldap_properties).and_return(:one => :two)
+        allow(@instance).to receive(:properties).and_return(:three => :four)
+        expect(@manager).to receive(:update).with(@instance.name, {:one => :two}, {:three => :four})
         @instance.flush
       end
     end
 
     describe "is being created" do
       before do
-        @rclass = mock 'resource_class'
-        @rclass.stubs(:validproperties).returns([:one, :two])
-        @resource = mock 'resource'
-        @resource.stubs(:class).returns @rclass
-        @resource.stubs(:should).returns nil
-        @instance.stubs(:resource).returns @resource
+        @rclass = double('resource_class')
+        allow(@rclass).to receive(:validproperties).and_return([:one, :two])
+        @resource = double('resource')
+        allow(@resource).to receive(:class).and_return(@rclass)
+        allow(@resource).to receive(:should).and_return(nil)
+        allow(@instance).to receive(:resource).and_return(@resource)
       end
 
       it "should set its :ensure value to :present" do
@@ -224,8 +223,8 @@ describe Puppet::Provider::Ldap do
       end
 
       it "should set all of the other attributes from the resource" do
-        @resource.expects(:should).with(:one).returns "oneval"
-        @resource.expects(:should).with(:two).returns "twoval"
+        expect(@resource).to receive(:should).with(:one).and_return("oneval")
+        expect(@resource).to receive(:should).with(:two).and_return("twoval")
 
         @instance.create
         expect(@instance.properties[:one]).to eq("oneval")