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

data/spec/unit/indirector/catalog/json_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/files'
 require 'puppet/resource/catalog'
@@ -24,7 +23,7 @@ describe Puppet::Resource::Catalog::Json do
     end
 
     before :each do
-      Puppet.run_mode.stubs(:master?).returns(true)
+      allow(Puppet.run_mode).to receive(:master?).and_return(true)
       Puppet[:server_datadir] = tmpdir('jsondir')
       FileUtils.mkdir_p(File.join(Puppet[:server_datadir], 'indirector_testing'))
     end

data/spec/unit/indirector/catalog/msgpack_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/resource/catalog'
 require 'puppet/indirector/catalog/msgpack'

data/spec/unit/indirector/catalog/rest_spec.rb

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

data/spec/unit/indirector/catalog/store_configs_spec.rb

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

data/spec/unit/indirector/catalog/yaml_spec.rb

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

data/spec/unit/indirector/certificate/ca_spec.rb

@@ -1,6 +1,4 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
-
 require 'puppet/indirector/certificate/ca'
 
 describe Puppet::SSL::Certificate::Ca do
@@ -14,10 +12,10 @@ describe Puppet::SSL::Certificate::Ca do
   end
 
   it "should store the ca certificate at the :cacert location" do
-    Puppet.settings.stubs(:use)
+    allow(Puppet.settings).to receive(:use)
     Puppet[:cacert] = File.expand_path("/ca/cert")
     file = Puppet::SSL::Certificate::Ca.new
-    file.stubs(:ca?).returns true
+    allow(file).to receive(:ca?).and_return(true)
     expect(file.path("whatever")).to eq(Puppet[:cacert])
   end
 end

data/spec/unit/indirector/certificate/disabled_ca_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/indirector/certificate/disabled_ca'
 
@@ -25,7 +24,7 @@ describe Puppet::SSL::Certificate::DisabledCa do
       end
 
       it "should forward local #{name} requests" do
-        Puppet::SSL::Certificate.indirection.terminus(:file).expects(name)
+        expect(Puppet::SSL::Certificate.indirection.terminus(:file)).to receive(name)
         subject.send(name, request(name, false))
       end
     end

data/spec/unit/indirector/certificate/file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/certificate/file'
@@ -14,10 +13,10 @@ describe Puppet::SSL::Certificate::File do
   end
 
   it "should store the ca certificate at the :localcacert location" do
-    Puppet.settings.stubs(:use)
+    allow(Puppet.settings).to receive(:use)
     Puppet[:localcacert] = File.expand_path("/ca/cert")
     file = Puppet::SSL::Certificate::File.new
-    file.stubs(:ca?).returns true
+    allow(file).to receive(:ca?).and_return(true)
     expect(file.path("whatever")).to eq(Puppet[:localcacert])
   end
 end

data/spec/unit/indirector/certificate/rest_spec.rb

@@ -1,6 +1,4 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
-
 require 'puppet/indirector/certificate/rest'
 
 describe Puppet::SSL::Certificate::Rest do
@@ -45,15 +43,15 @@ rn/G
 -----END CERTIFICATE-----
 "
 
-    network = stub 'network'
-    terminus.stubs(:network).returns network
+    network = double('network')
+    allow(terminus).to receive(:network).and_return(network)
 
-    response = stub 'response', :code => "200", :body => cert_string
-    response.stubs(:[]).with('content-type').returns "text/plain"
-    response.stubs(:[]).with('content-encoding')
-    response.stubs(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).returns(Puppet.version)
-    network.stubs(:verify_callback=)
-    network.expects(:get).returns response
+    response = double('response', :code => "200", :body => cert_string)
+    allow(response).to receive(:[]).with('content-type').and_return("text/plain")
+    allow(response).to receive(:[]).with('content-encoding')
+    allow(response).to receive(:[]).with(Puppet::Network::HTTP::HEADER_PUPPET_VERSION).and_return(Puppet.version)
+    allow(network).to receive(:verify_callback=)
+    expect(network).to receive(:get).and_return(response)
 
     request = Puppet::Indirector::Request.new(:certificate, :find, "foo.com", nil)
     result = terminus.find(request)

data/spec/unit/indirector/certificate_request/ca_spec.rb

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

data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/indirector/certificate_request/disabled_ca'
 
@@ -25,7 +24,7 @@ describe Puppet::SSL::CertificateRequest::DisabledCa do
       end
 
       it "should forward local #{name} requests" do
-        Puppet::SSL::CertificateRequest.indirection.terminus(:file).expects(name)
+        expect(Puppet::SSL::CertificateRequest.indirection.terminus(:file)).to receive(name)
         subject.send(name, request(name, false))
       end
     end

data/spec/unit/indirector/certificate_request/file_spec.rb

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

data/spec/unit/indirector/certificate_request/rest_spec.rb

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

data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/certificate_revocation_list/ca'
@@ -9,7 +8,7 @@ describe Puppet::SSL::CertificateRevocationList::Ca do
   end
 
   it "should use the :cacrl setting as the crl location" do
-    Puppet.settings.stubs(:use)
+    allow(Puppet.settings).to receive(:use)
     Puppet[:cacrl] = File.expand_path("/request/dir")
     expect(Puppet::SSL::CertificateRevocationList::Ca.new.path("whatever")).to eq(Puppet[:cacrl])
   end

data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/indirector/certificate_revocation_list/disabled_ca'
 
@@ -25,7 +24,7 @@ describe Puppet::SSL::CertificateRevocationList::DisabledCa do
       end
 
       it "should forward local #{name} requests" do
-        Puppet::SSL::CertificateRevocationList.indirection.terminus(:file).expects(name)
+        expect(Puppet::SSL::CertificateRevocationList.indirection.terminus(:file)).to receive(name)
         subject.send(name, request(name, false))
       end
     end

data/spec/unit/indirector/certificate_revocation_list/file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/certificate_revocation_list/file'
@@ -11,7 +10,7 @@ describe Puppet::SSL::CertificateRevocationList::File do
   it "should always store the file to :hostcrl location" do
     crl = File.expand_path("/host/crl")
     Puppet[:hostcrl] = crl
-    Puppet.settings.stubs(:use)
+    allow(Puppet.settings).to receive(:use)
     expect(Puppet::SSL::CertificateRevocationList::File.file_location).to eq(crl)
   end
 end

data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/certificate_revocation_list/rest'
@@ -25,9 +24,9 @@ describe Puppet::SSL::CertificateRevocationList::Rest do
   end
 
   it "temporarily disables revocation checking when finding a CRL and no CRL is available" do
-    Puppet::FileSystem.expects(:exist?).with(Puppet[:hostcrl]).returns false
+    expect(Puppet::FileSystem).to receive(:exist?).with(Puppet[:hostcrl]).and_return(false)
     Puppet.override({:certificate_revocation => :chain}) do
-      Puppet.expects(:override).with({:certificate_revocation => false}, anything)
+      expect(Puppet).to receive(:override).with({:certificate_revocation => false}, anything)
       subject.find(nil)
     end
   end

data/spec/unit/indirector/certificate_status/file_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/ssl/host'
 require 'puppet/indirector/certificate_status'
@@ -12,7 +11,7 @@ describe "Puppet::Indirector::CertificateStatus::File" do
   end
 
   before do
-    Puppet::SSL::CertificateAuthority.stubs(:ca?).returns true
+    allow(Puppet::SSL::CertificateAuthority).to receive(:ca?).and_return(true)
     @terminus = Puppet::SSL::Host.indirection.terminus(:file)
 
     @tmpdir = tmpdir("certificate_status_ca_testing")
@@ -62,7 +61,7 @@ describe "Puppet::Indirector::CertificateStatus::File" do
 
   describe "when creating the CA" do
     it "should fail if it is not a valid CA" do
-      Puppet::SSL::CertificateAuthority.expects(:ca?).returns false
+      expect(Puppet::SSL::CertificateAuthority).to receive(:ca?).and_return(false)
       expect { @terminus.ca }.to raise_error(ArgumentError, "This process is not configured as a certificate authority")
     end
   end

data/spec/unit/indirector/certificate_status/rest_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/ssl/host'
 require 'puppet/indirector/certificate_status'

data/spec/unit/indirector/code_spec.rb

@@ -1,13 +1,12 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/indirector/code'
 
 describe Puppet::Indirector::Code do
-  before :all do
-    Puppet::Indirector::Terminus.stubs(:register_terminus_class)
-    @model = mock 'model'
-    @indirection = stub 'indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model
-    Puppet::Indirector::Indirection.stubs(:instance).returns(@indirection)
+  before(:each) do
+    allow(Puppet::Indirector::Terminus).to receive(:register_terminus_class)
+    @model = double('model')
+    @indirection = double('indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model)
+    allow(Puppet::Indirector::Indirection).to receive(:instance).and_return(@indirection)
 
     module Testing; end
     @code_class = class Testing::MyCode < Puppet::Indirector::Code

data/spec/unit/indirector/direct_file_server_spec.rb

@@ -1,16 +1,23 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/direct_file_server'
 
 describe Puppet::Indirector::DirectFileServer do
-  before :all do
-    Puppet::Indirector::Terminus.stubs(:register_terminus_class)
-    @model = mock 'model'
-    @indirection = stub 'indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model
-    Puppet::Indirector::Indirection.stubs(:instance).returns(@indirection)
+  before(:each) do
+    allow(Puppet::Indirector::Terminus).to receive(:register_terminus_class)
+    @model = double('model')
+    @indirection = double('indirection', :name => :mystuff, :register_terminus_type => nil, :model => @model)
+    allow(Puppet::Indirector::Indirection).to receive(:instance).and_return(@indirection)
 
     module Testing; end
+
+    # The Indirector does a lot of class-level caching of things, and indirections register themselves
+    # whenever they're created (at include time), which makes working with them in tests _very_ annoying.
+    # We're effectively undefining the test class if it exists from a previous test so that we can
+    # re-register the new one as any mocks/stubs that existed on the old one from a previous test will no
+    # longer be valid, and will cause rspec-mocks to (rightfully) blow up.
+    Testing.send(:remove_const, :Mytype) if Testing.constants.include?(:Mytype)
+
     @direct_file_class = class Testing::Mytype < Puppet::Indirector::DirectFileServer
       self
     end
@@ -26,64 +33,63 @@ describe Puppet::Indirector::DirectFileServer do
   describe Puppet::Indirector::DirectFileServer, "when finding a single file" do
 
     it "should return nil if the file does not exist" do
-      Puppet::FileSystem.expects(:exist?).with(@path).returns false
+      expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(false)
       expect(@server.find(@request)).to be_nil
     end
 
     it "should return a Content instance created with the full path to the file if the file exists" do
-      Puppet::FileSystem.expects(:exist?).with(@path).returns true
-      mycontent = stub 'content', :collect => nil
-      mycontent.expects(:collect)
-      @model.expects(:new).returns(mycontent)
+      expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
+      mycontent = double('content', :collect => nil)
+      expect(mycontent).to receive(:collect)
+      expect(@model).to receive(:new).and_return(mycontent)
       expect(@server.find(@request)).to eq(mycontent)
     end
   end
 
   describe Puppet::Indirector::DirectFileServer, "when creating the instance for a single found file" do
-
     before do
-      @data = mock 'content'
-      @data.stubs(:collect)
-      Puppet::FileSystem.expects(:exist?).with(@path).returns true
+      @data = double('content')
+      allow(@data).to receive(:collect)
+      expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
     end
 
     it "should pass the full path to the instance" do
-      @model.expects(:new).with { |key, options| key == @path }.returns(@data)
+      expect(@model).to receive(:new).with(@path, anything).and_return(@data)
       @server.find(@request)
     end
 
     it "should pass the :links setting on to the created Content instance if the file exists and there is a value for :links" do
-      @model.expects(:new).returns(@data)
-      @data.expects(:links=).with(:manage)
+      expect(@model).to receive(:new).and_return(@data)
+      expect(@data).to receive(:links=).with(:manage)
 
-      @request.stubs(:options).returns(:links => :manage)
+      allow(@request).to receive(:options).and_return(:links => :manage)
       @server.find(@request)
     end
 
     it "should set 'checksum_type' on the instances if it is set in the request options" do
-      @model.expects(:new).returns(@data)
-      @data.expects(:checksum_type=).with :checksum
+      expect(@model).to receive(:new).and_return(@data)
+      expect(@data).to receive(:checksum_type=).with(:checksum)
 
-      @request.stubs(:options).returns(:checksum_type => :checksum)
+      allow(@request).to receive(:options).and_return(:checksum_type => :checksum)
       @server.find(@request)
     end
   end
 
   describe Puppet::Indirector::DirectFileServer, "when searching for multiple files" do
     it "should return nil if the file does not exist" do
-      Puppet::FileSystem.expects(:exist?).with(@path).returns false
+      expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(false)
       expect(@server.find(@request)).to be_nil
     end
 
     it "should use :path2instances from the terminus_helper to return instances if the file exists" do
-      Puppet::FileSystem.expects(:exist?).with(@path).returns true
-      @server.expects(:path2instances)
+      expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
+      expect(@server).to receive(:path2instances)
       @server.search(@request)
     end
 
     it "should pass the original request to :path2instances" do
-      Puppet::FileSystem.expects(:exist?).with(@path).returns true
-      @server.expects(:path2instances).with(@request, @path)
+      expect(Puppet::FileSystem).to receive(:exist?).with(@path).and_return(true)
+      expect(@server).to receive(:path2instances).with(@request, @path)
       @server.search(@request)
     end
   end

data/spec/unit/indirector/envelope_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/indirector/envelope'
 
@@ -25,7 +24,7 @@ describe Puppet::Indirector::Envelope do
 
     it "should return false if the current date is equal to the expiration date" do
       now = Time.now
-      Time.stubs(:now).returns(now)
+      allow(Time).to receive(:now).and_return(now)
       @instance.expiration = now
       expect(@instance).not_to be_expired
     end

data/spec/unit/indirector/exec_spec.rb

@@ -1,27 +1,28 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/indirector/exec'
 
 describe Puppet::Indirector::Exec do
-  before :all do
-    @indirection = stub 'indirection', :name => :testing
-    Puppet::Indirector::Indirection.expects(:instance).with(:testing).returns(@indirection)
+  let(:path) { File.expand_path('/echo') }
+  let(:arguments) { {:failonfail => true, :combine => false } }
+
+  before :each do
+    @indirection = Puppet::Indirector::Indirection.new(nil, :testing)
+
     module Testing; end
     @exec_class = class Testing::MyTesting < Puppet::Indirector::Exec
       attr_accessor :command
       self
     end
-  end
 
-  let(:path) { File.expand_path('/echo') }
-  let(:arguments) { {:failonfail => true, :combine => false } }
-
-  before :each do
     @searcher = @exec_class.new
     @searcher.command = [path]
 
-    @request = stub 'request', :key => "foo"
+    @request = double('request', :key => "foo")
+  end
+
+  after(:each) do
+    @indirection.delete
   end
 
   it "should throw an exception if the command is not an array" do
@@ -35,22 +36,22 @@ describe Puppet::Indirector::Exec do
   end
 
   it "should execute the command with the object name as the only argument" do
-    @searcher.expects(:execute).with([path, 'foo'], arguments)
+    expect(@searcher).to receive(:execute).with([path, 'foo'], arguments)
     @searcher.find(@request)
   end
 
   it "should return the output of the script" do
-    @searcher.expects(:execute).with([path, 'foo'], arguments).returns("whatever")
+    expect(@searcher).to receive(:execute).with([path, 'foo'], arguments).and_return("whatever")
     expect(@searcher.find(@request)).to eq("whatever")
   end
 
   it "should return nil when the command produces no output" do
-    @searcher.expects(:execute).with([path, 'foo'], arguments).returns(nil)
+    expect(@searcher).to receive(:execute).with([path, 'foo'], arguments).and_return(nil)
     expect(@searcher.find(@request)).to be_nil
   end
 
   it "should raise an exception if there's an execution failure" do
-    @searcher.expects(:execute).with([path, 'foo'], arguments).raises(Puppet::ExecutionFailure.new("message"))
+    expect(@searcher).to receive(:execute).with([path, 'foo'], arguments).and_raise(Puppet::ExecutionFailure.new("message"))
     expect {
       @searcher.find(@request)
     }.to raise_exception(Puppet::Error, 'Failed to find foo via exec: message')