puppet 5.3.4 → 6.29.0

data/spec/lib/puppet_spec/modules.rb

@@ -6,7 +6,8 @@ module PuppetSpec::Modules
 
       environment = options[:environment]
 
-      if metadata = options[:metadata]
+      metadata = options[:metadata]
+      if metadata
         metadata[:source]  ||= 'github'
         metadata[:author]  ||= 'puppetlabs'
         metadata[:version] ||= '9.9.9'
@@ -20,16 +21,50 @@ module PuppetSpec::Modules
         end
       end
 
-      if tasks = options[:tasks]
+      tasks = options[:tasks]
+      if tasks
         tasks_dir = File.join(module_dir, 'tasks')
         FileUtils.mkdir_p(tasks_dir)
         tasks.each do |task_files|
           task_files.each do |task_file|
-            FileUtils.touch(File.join(tasks_dir, task_file))
+            if task_file.is_a?(String)
+              # default content to acceptable metadata
+              task_file = { :name => task_file, :content => "{}" }
+            end
+            File.write(File.join(tasks_dir, task_file[:name]), task_file[:content])
           end
         end
       end
 
+      if (plans = options[:plans])
+        plans_dir = File.join(module_dir, 'plans')
+        FileUtils.mkdir_p(plans_dir)
+        plans.each do |plan_file|
+          if plan_file.is_a?(String)
+            # default content to acceptable metadata
+            plan_file = { :name => plan_file, :content => "{}" }
+          end
+          File.write(File.join(plans_dir, plan_file[:name]), plan_file[:content])
+        end
+      end
+
+      if (scripts = options[:scripts])
+        scripts_dir = File.join(module_dir, 'scripts')
+        FileUtils.mkdir_p(scripts_dir)
+        scripts.each do |script_file|
+          if script_file.is_a?(String)
+            script_file = { :name => script_file, :content => "" }
+          end
+          File.write(File.join(scripts_dir, script_file[:name]), script_file[:content])
+        end
+      end
+
+      (options[:files] || {}).each do |fname, content|
+        path = File.join(module_dir, fname)
+        FileUtils.mkdir_p(File.dirname(path))
+        File.write(path, content)
+      end
+
       Puppet::Module.new(name, module_dir, environment)
     end
 
@@ -37,7 +72,7 @@ module PuppetSpec::Modules
       module_dir = File.join(dir, name)
       FileUtils.mkdir_p(module_dir)
 
-      if metadata = options[:metadata]
+      if (metadata = options[:metadata])
         File.open(File.join(module_dir, 'metadata.json'), 'w') do |f|
           f.write(metadata.to_json)
         end

data/spec/lib/puppet_spec/puppetserver.rb

@@ -0,0 +1,179 @@
+require 'spec_helper'
+require 'webrick'
+require "webrick/ssl"
+
+class PuppetSpec::Puppetserver
+  include PuppetSpec::Fixtures
+  include PuppetSpec::Files
+
+  attr_reader :ca_cert, :ca_crl, :server_cert, :server_key
+
+  class NodeServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET request, response
+      node = Puppet::Node.new(Puppet[:certname])
+      response.body = node.render(:json)
+      response['Content-Type'] = 'application/json'
+    end
+  end
+
+  class CatalogServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_POST request, response
+      response['Content-Type'] = 'application/json'
+      catalog = Puppet::Resource::Catalog.new(Puppet[:certname], 'production')
+      response.body = catalog.render(:json)
+    end
+  end
+
+  class FileMetadatasServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET request, response
+      response['Content-Type'] = 'application/json'
+      response.body = "[{\"path\":\"/etc/puppetlabs/code/environments/production/modules\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-03-06 20:14:25 UTC\"},\"type\":\"directory\",\"destination\":null}]"
+    end
+  end
+
+  class FileMetadataServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET request, response
+      response['Content-Type'] = 'application/json'
+      response.body = "{\"path\":\"/etc/puppetlabs/code/environments/production/modules\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-03-06 20:14:25 UTC\"},\"type\":\"directory\",\"destination\":null}"
+    end
+  end
+
+  class FileContentServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET request, response
+      response.status = 404
+    end
+  end
+
+  class ReportServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_PUT request, response
+      response['Content-Type'] = 'application/json'
+      response.body = "[]"
+    end
+  end
+
+  class StaticFileContentServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET request, response
+      response.status = 404
+    end
+  end
+
+  class FilebucketServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_GET request, response
+    end
+
+    def do_PUT request, response
+      upload = File.join(@config.config[:TempDir], 'filebucket')
+      File.open(upload, 'wb') { |f| f.write(request.body) }
+      response['Content-Type'] = 'application/octet-stream'
+    end
+
+    def do_HEAD request, response
+      response.status = 404
+    end
+  end
+
+  class CertificateServlet < WEBrick::HTTPServlet::AbstractServlet
+    def initialize(server, ca_cert)
+      super(server)
+      @ca_cert = ca_cert
+    end
+
+    def do_GET request, response
+      if request.path =~ %r{/puppet-ca/v1/certificate/ca$}
+        response['Content-Type'] = 'text/plain'
+        response.body = @ca_cert.to_pem
+      else
+        response.status = 404
+      end
+    end
+  end
+
+  class CertificateRevocationListServlet < WEBrick::HTTPServlet::AbstractServlet
+    def initialize(server, crl)
+      super(server)
+      @crl = crl
+    end
+
+    def do_GET request, response
+      response['Content-Type'] = 'text/plain'
+      response.body = @crl.to_pem
+    end
+  end
+
+  class CertificateRequestServlet < WEBrick::HTTPServlet::AbstractServlet
+    def do_PUT request, response
+      response.status = 404
+    end
+  end
+
+  def initialize
+    @ca_cert = cert_fixture('ca.pem')
+    @ca_crl = crl_fixture('crl.pem')
+    @server_key = key_fixture('127.0.0.1-key.pem')
+    @server_cert = cert_fixture('127.0.0.1.pem')
+    @path = tmpfile('webrick')
+
+    @https = WEBrick::HTTPServer.new(
+      BindAddress: "127.0.0.1",
+      Port: 0, # webrick will choose the first available port, and set it in the config
+      SSLEnable: true,
+      SSLStartImmediately: true,
+      SSLCACertificateFile: File.join(PuppetSpec::FIXTURE_DIR, 'ssl', 'ca.pem'),
+      SSLCertificate: @server_cert,
+      SSLPrivateKey: @server_key,
+      Logger: WEBrick::Log.new(@path),
+      AccessLog: [
+        [@path, WEBrick::AccessLog::COMBINED_LOG_FORMAT],
+      ]
+    )
+
+    trap('INT') do
+      @https.shutdown
+    end
+
+    # Enable this line for more detailed webrick logging
+    # @https.logger.level = 5 # DEBUG
+  end
+
+  def start_server(mounts: {}, &block)
+    register_mounts(mounts: mounts)
+
+    Thread.new do
+      @https.start
+    end
+
+    begin
+      yield @https.config[:Port]
+    ensure
+      @https.shutdown
+    end
+  end
+
+  def register_mounts(mounts: {})
+    register_mount('/status/v1/simple/master', proc { |req, res|  }, nil)
+    register_mount('/puppet/v3/node', mounts[:node], NodeServlet)
+    register_mount('/puppet/v3/catalog', mounts[:catalog], CatalogServlet)
+    register_mount('/puppet/v3/file_metadata', mounts[:file_metadata], FileMetadataServlet)
+    register_mount('/puppet/v3/file_metadatas', mounts[:file_metadatas], FileMetadatasServlet)
+    register_mount('/puppet/v3/file_content', mounts[:file_content], FileContentServlet)
+    register_mount('/puppet/v3/static_file_content', mounts[:static_file_content], StaticFileContentServlet)
+    register_mount('/puppet/v3/report', mounts[:report], ReportServlet)
+    register_mount('/puppet/v3/file_bucket_file', mounts[:filebucket], FilebucketServlet)
+    register_mount('/puppet-ca/v1/certificate', mounts[:certificate], CertificateServlet, @ca_cert)
+    register_mount('/puppet-ca/v1/certificate_revocation_list', mounts[:certificate_revocation_list], CertificateRevocationListServlet, @ca_crl)
+    register_mount('/puppet-ca/v1/certificate_request', mounts[:certificate_request], CertificateRequestServlet)
+  end
+
+  def register_mount(path, user_proc, default_servlet, *args)
+    handler = if user_proc
+                WEBrick::HTTPServlet::ProcHandler.new(user_proc)
+              else
+                default_servlet
+              end
+    @https.mount(path, handler, *args)
+  end
+
+  def upload_directory
+    @https.config[:TempDir]
+  end
+end

data/spec/lib/puppet_spec/scope.rb

@@ -1,4 +1,3 @@
-
 module PuppetSpec::Scope
   # Initialize a new scope suitable for testing.
   #
@@ -11,4 +10,4 @@ module PuppetSpec::Scope
     scope
   end
 
-end
+end

data/spec/lib/puppet_spec/settings.rb

@@ -12,9 +12,15 @@ module PuppetSpec::Settings
     :codedir      => { :type => :directory, :default => "test", :desc => "codedir" },
     :vardir       => { :type => :directory, :default => "test", :desc => "vardir" },
     :rundir       => { :type => :directory, :default => "test", :desc => "rundir" },
-  }
+  }.freeze
+
+  TEST_APP_DEFAULT_VALUES = TEST_APP_DEFAULT_DEFINITIONS.inject({}) do |memo, (key, value)|
+    memo[key] = value[:default]
+    memo
+  end.freeze
 
   def set_puppet_conf(confdir, settings)
+    FileUtils.mkdir_p(confdir)
     write_file(File.join(confdir, "puppet.conf"), settings)
   end
 

data/spec/lib/puppet_spec/ssl.rb

@@ -0,0 +1,265 @@
+require 'openssl'
+
+module PuppetSpec
+  module SSL
+
+    PRIVATE_KEY_LENGTH = 2048
+    FIVE_YEARS = 5 * 365 * 24 * 60 * 60
+    CA_EXTENSIONS = [
+      ["basicConstraints", "CA:TRUE", true],
+      ["keyUsage", "keyCertSign, cRLSign", true],
+      ["subjectKeyIdentifier", "hash", false],
+      ["authorityKeyIdentifier", "keyid:always", false]
+    ]
+    NODE_EXTENSIONS = [
+      ["keyUsage", "digitalSignature", true],
+      ["subjectKeyIdentifier", "hash", false]
+    ]
+    DEFAULT_SIGNING_DIGEST = OpenSSL::Digest::SHA256.new
+    DEFAULT_REVOCATION_REASON = OpenSSL::OCSP::REVOKED_STATUS_KEYCOMPROMISE
+    ROOT_CA_NAME = "/CN=root-ca-\u{2070E}"
+    REVOKED_INT_CA_NAME = "/CN=revoked-int-ca-\u16A0"
+    INT_CA_NAME = "/CN=unrevoked-int-ca\u06FF\u16A0\u{2070E}"
+    LEAF_CA_NAME = "/CN=leaf-ca-\u06FF"
+    EXPLANATORY_TEXT = <<-EOT
+# Root Issuer: #{ROOT_CA_NAME}
+# Intermediate Issuer: #{INT_CA_NAME}
+# Leaf Issuer: #{LEAF_CA_NAME}
+EOT
+
+
+    def self.create_private_key(length = PRIVATE_KEY_LENGTH)
+      OpenSSL::PKey::RSA.new(length)
+    end
+
+    def self.self_signed_ca(key, name)
+      cert = OpenSSL::X509::Certificate.new
+
+      cert.public_key = key.public_key
+      cert.subject = OpenSSL::X509::Name.parse(name)
+      cert.issuer = cert.subject
+      cert.version = 2
+      cert.serial = rand(2**128)
+
+      not_before = just_now
+      cert.not_before = not_before
+      cert.not_after = not_before + FIVE_YEARS
+
+      ext_factory = extension_factory_for(cert, cert)
+      CA_EXTENSIONS.each do |ext|
+        extension = ext_factory.create_extension(*ext)
+        cert.add_extension(extension)
+      end
+
+      cert.sign(key, DEFAULT_SIGNING_DIGEST)
+
+      cert
+    end
+
+    def self.create_csr(key, name)
+      csr = OpenSSL::X509::Request.new
+
+      csr.public_key = key.public_key
+      csr.subject = OpenSSL::X509::Name.parse(name)
+      csr.version = 2
+      csr.sign(key, DEFAULT_SIGNING_DIGEST)
+
+      csr
+    end
+
+    def self.sign(ca_key, ca_cert, csr, extensions = NODE_EXTENSIONS)
+      cert = OpenSSL::X509::Certificate.new
+
+      cert.public_key = csr.public_key
+      cert.subject = csr.subject
+      cert.issuer = ca_cert.subject
+      cert.version = 2
+      cert.serial = rand(2**128)
+
+      not_before = just_now
+      cert.not_before = not_before
+      cert.not_after = not_before + FIVE_YEARS
+
+      ext_factory = extension_factory_for(ca_cert, cert)
+      extensions.each do |ext|
+        extension = ext_factory.create_extension(*ext)
+        cert.add_extension(extension)
+      end
+
+      cert.sign(ca_key, DEFAULT_SIGNING_DIGEST)
+
+      cert
+    end
+
+    def self.create_crl_for(ca_cert, ca_key)
+      crl = OpenSSL::X509::CRL.new
+      crl.version = 1
+      crl.issuer = ca_cert.subject
+
+      ef = extension_factory_for(ca_cert)
+      crl.add_extension(
+        ef.create_extension(["authorityKeyIdentifier", "keyid:always", false]))
+      crl.add_extension(
+        OpenSSL::X509::Extension.new("crlNumber", OpenSSL::ASN1::Integer(0)))
+
+      not_before = just_now
+      crl.last_update = not_before
+      crl.next_update = not_before + FIVE_YEARS
+      crl.sign(ca_key, DEFAULT_SIGNING_DIGEST)
+
+      crl
+    end
+
+    def self.revoke(serial, crl, ca_key)
+      revoked = OpenSSL::X509::Revoked.new
+      revoked.serial = serial
+      revoked.time = Time.now
+      revoked.add_extension(
+        OpenSSL::X509::Extension.new("CRLReason",
+                                     OpenSSL::ASN1::Enumerated(DEFAULT_REVOCATION_REASON)))
+
+      crl.add_revoked(revoked)
+      extensions = crl.extensions.group_by{|e| e.oid == 'crlNumber' }
+      crl_number = extensions[true].first
+      unchanged_exts = extensions[false]
+
+      next_crl_number = crl_number.value.to_i + 1
+      new_crl_number_ext = OpenSSL::X509::Extension.new("crlNumber",
+                                                        OpenSSL::ASN1::Integer(next_crl_number))
+
+      crl.extensions = unchanged_exts + [new_crl_number_ext]
+      crl.sign(ca_key, DEFAULT_SIGNING_DIGEST)
+
+      crl
+    end
+
+    # Creates a self-signed root ca, then signs two node certs, revoking one of them.
+    # Creates an intermediate CA and one node cert off of it.
+    # Creates a second intermediate CA and one node cert off if it.
+    # Creates a leaf CA off of the intermediate CA, then signs two node certs revoking one of them.
+    # Revokes an intermediate CA.
+    # Returns the ca bundle, crl chain, and all the node certs
+    #
+    #            -----
+    #           /     \
+    #          /       \
+    #          | root  +-------------------o------------------o
+    #          \  CA   /                   |                  |
+    #           \     /                    |                  |
+    #            --+--                     |                  |
+    #              |                       |                  |
+    #              |                       |                  |
+    #              |                       |                  |
+    #              |                     --+--              --+--
+    # +---------+  |   +---------+      /     \            /     \
+    # | revoked |  |   |         |     /revoked\          /       \
+    # |   node  +--o---+   node  |     |  int  |          | int   |
+    # |         |      |         |     \  CA   /          \  CA   /
+    # +---------+      +---------+      \     /            \     /
+    #                                    --+--              --+--
+    #                                      |                  |
+    #                                      |                  |
+    #                                      |                  |
+    #                                    --+--                |
+    #                                   /     \           +---+-----+
+    #                                  /       \          |         |
+    #                                  | leaf  |          |  node   |
+    #                                  \  CA   /          |         |
+    #                                   \     /           +---------+
+    #                                    --+--
+    #                                      |
+    #                                      |
+    #                         +---------+  |  +----------+
+    #                         | revoked |  |  |          |
+    #                         |   node  +--o--+  node    |
+    #                         |         |     |          |
+    #                         +---------+     +----------+
+    def self.create_chained_pki
+      root_key = create_private_key
+      root_cert = self_signed_ca(root_key, ROOT_CA_NAME)
+      root_crl = create_crl_for(root_cert, root_key)
+
+      unrevoked_root_node_key = create_private_key
+      unrevoked_root_node_csr = create_csr(unrevoked_root_node_key, "/CN=unrevoked-root-node")
+      unrevoked_root_node_cert = sign(root_key, root_cert, unrevoked_root_node_csr)
+
+      revoked_root_node_key = create_private_key
+      revoked_root_node_csr = create_csr(revoked_root_node_key, "/CN=revoked-root-node")
+      revoked_root_node_cert = sign(root_key, root_cert, revoked_root_node_csr)
+
+      revoke(revoked_root_node_cert.serial, root_crl, root_key)
+
+      revoked_int_key = create_private_key
+      revoked_int_csr = create_csr(revoked_int_key, REVOKED_INT_CA_NAME)
+      revoked_int_cert = sign(root_key, root_cert, revoked_int_csr, CA_EXTENSIONS)
+      revoked_int_crl = create_crl_for(revoked_int_cert, revoked_int_key)
+
+      int_key = create_private_key
+      int_csr = create_csr(int_key, INT_CA_NAME)
+      int_cert = sign(root_key, root_cert, int_csr, CA_EXTENSIONS)
+
+      int_node_key = create_private_key
+      int_node_csr = create_csr(int_node_key, "/CN=unrevoked-int-node")
+      int_node_cert = sign(int_key, int_cert, int_node_csr)
+
+      unrevoked_int_node_key = create_private_key
+      unrevoked_int_node_csr = create_csr(unrevoked_int_node_key, "/CN=unrevoked-int-node")
+      unrevoked_int_node_cert = sign(revoked_int_key, revoked_int_cert, unrevoked_int_node_csr)
+
+      leaf_key = create_private_key
+      leaf_csr = create_csr(leaf_key, LEAF_CA_NAME)
+      leaf_cert = sign(revoked_int_key, revoked_int_cert, leaf_csr, CA_EXTENSIONS)
+      leaf_crl = create_crl_for(leaf_cert, leaf_key)
+
+      revoke(revoked_int_cert.serial, root_crl, root_key)
+
+      unrevoked_leaf_node_key = create_private_key
+      unrevoked_leaf_node_csr = create_csr(unrevoked_leaf_node_key, "/CN=unrevoked-leaf-node")
+      unrevoked_leaf_node_cert = sign(leaf_key, leaf_cert, unrevoked_leaf_node_csr)
+
+      revoked_leaf_node_key = create_private_key
+      revoked_leaf_node_csr = create_csr(revoked_leaf_node_key, "/CN=revoked-leaf-node")
+      revoked_leaf_node_cert = sign(leaf_key, leaf_cert, revoked_leaf_node_csr)
+
+      revoke(revoked_leaf_node_cert.serial, leaf_crl, leaf_key)
+
+
+      ca_bundle = bundle(root_cert, revoked_int_cert, leaf_cert)
+      crl_chain = bundle(root_crl, revoked_int_crl, leaf_crl)
+
+      {
+        :root_cert => root_cert,
+        :int_cert => int_cert,
+        :int_node_cert => int_node_cert,
+        :leaf_cert => leaf_cert,
+        :leaf_key => leaf_key,
+        :revoked_root_node_cert => revoked_root_node_cert,
+        :revoked_int_cert => revoked_int_cert,
+        :revoked_leaf_node_cert => revoked_leaf_node_cert,
+        :unrevoked_root_node_cert => unrevoked_root_node_cert,
+        :unrevoked_int_node_cert  => unrevoked_int_node_cert,
+        :unrevoked_leaf_node_cert => unrevoked_leaf_node_cert,
+        :ca_bundle => ca_bundle,
+        :crl_chain => crl_chain,
+      }
+    end
+
+   private
+
+    def self.just_now
+      Time.now - 1
+    end
+
+    def self.extension_factory_for(ca, cert = nil)
+      ef = OpenSSL::X509::ExtensionFactory.new
+      ef.issuer_certificate  = ca
+      ef.subject_certificate = cert if cert
+
+      ef
+    end
+
+    def self.bundle(*items)
+      items.map {|i| EXPLANATORY_TEXT + i.to_pem }.join("\n")
+    end
+  end
+end

data/spec/shared_behaviours/all_parsedfile_providers.rb

@@ -5,7 +5,7 @@ shared_examples_for "all parsedfile providers" do |provider, *files|
 
   files.flatten.each do |file|
     it "should rewrite #{file} reasonably unchanged" do
-      provider.stubs(:default_target).returns(file)
+      allow(provider).to receive(:default_target).and_return(file)
       provider.prefetch
 
       text = provider.to_file(provider.target_records(file))

data/spec/shared_behaviours/documentation_on_faces.rb

@@ -176,8 +176,6 @@ shared_examples_for "documentation on faces" do
       subject.license = "foo"
       expect(subject.license).to eq("foo")
     end
-
-    it "should accept symbols to specify existing licenses..."
   end
 
   describe "#copyright" do

data/spec/shared_behaviours/file_server_terminus.rb

@@ -1,11 +1,10 @@
-#! /usr/bin/env ruby
 shared_examples_for "Puppet::Indirector::FileServerTerminus" do
   # This only works if the shared behaviour is included before
   # the 'before' block in the including context.
   before do
     Puppet::FileServing::Configuration.instance_variable_set(:@configuration, nil)
-    Puppet::FileSystem.stubs(:exist?).returns true
-    Puppet::FileSystem.stubs(:exist?).with(Puppet[:fileserverconfig]).returns(true)
+    allow(Puppet::FileSystem).to receive(:exist?).and_return(true)
+    allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:fileserverconfig]).and_return(true)
 
     @path = Tempfile.new("file_server_testing")
     path = @path.path
@@ -19,22 +18,20 @@ shared_examples_for "Puppet::Indirector::FileServerTerminus" do
     @mount1 = Puppet::FileServing::Configuration::Mount::File.new("one")
     @mount1.path = @path
 
-    @parser = stub 'parser', :changed? => false
-    @parser.stubs(:parse).returns("one" => @mount1)
+    @parser = double('parser', :changed? => false)
+    allow(@parser).to receive(:parse).and_return("one" => @mount1)
 
-    Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
+    allow(Puppet::FileServing::Configuration::Parser).to receive(:new).and_return(@parser)
 
     # Stub out the modules terminus
-    @modules = mock 'modules terminus'
+    @modules = double('modules terminus')
 
     @request = Puppet::Indirector::Request.new(:indirection, :method, "puppet://myhost/one/myfile", nil)
   end
 
   it "should use the file server configuration to find files" do
-    @modules.stubs(:find).returns(nil)
-    @terminus.indirection.stubs(:terminus).with(:modules).returns(@modules)
-
-    path = File.join(@path, "myfile")
+    allow(@modules).to receive(:find).and_return(nil)
+    allow(@terminus.indirection).to receive(:terminus).with(:modules).and_return(@modules)
 
     expect(@terminus.find(@request)).to be_instance_of(@test_class)
   end

data/spec/shared_behaviours/file_serving.rb

@@ -1,5 +1,3 @@
-#! /usr/bin/env ruby
-
 shared_examples_for "Puppet::FileServing::Files" do |indirection|
   %w[find search].each do |method|
     let(:request) { Puppet::Indirector::Request.new(indirection, method, 'foo', nil) }
@@ -8,7 +6,7 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
       it "should proxy to file terminus if the path is absolute" do
         request.key = make_absolute('/tmp/foo')
 
-        described_class.indirection.terminus(:file).class.any_instance.expects(method).with(request)
+        expect_any_instance_of(described_class.indirection.terminus(:file).class).to receive(method).with(request)
 
         subject.send(method, request)
       end
@@ -16,7 +14,7 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
       it "should proxy to file terminus if the protocol is file" do
         request.protocol = 'file'
 
-        described_class.indirection.terminus(:file).class.any_instance.expects(method).with(request)
+        expect_any_instance_of(described_class.indirection.terminus(:file).class).to receive(method).with(request)
 
         subject.send(method, request)
       end
@@ -34,7 +32,7 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
           it "should proxy to rest terminus if default_file_terminus is rest" do
             Puppet[:default_file_terminus] = "rest"
 
-            described_class.indirection.terminus(:rest).class.any_instance.expects(method).with(request)
+            expect_any_instance_of(described_class.indirection.terminus(:rest).class).to receive(method).with(request)
 
             subject.send(method, request)
           end
@@ -42,7 +40,7 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
           it "should proxy to rest terminus if default_file_terminus is not rest" do
             Puppet[:default_file_terminus] = 'file_server'
 
-            described_class.indirection.terminus(:rest).class.any_instance.expects(method).with(request)
+            expect_any_instance_of(described_class.indirection.terminus(:rest).class).to receive(method).with(request)
 
             subject.send(method, request)
           end
@@ -56,7 +54,7 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
           it "should proxy to file_server if default_file_terminus is 'file_server'" do
             Puppet[:default_file_terminus] = 'file_server'
 
-            described_class.indirection.terminus(:file_server).class.any_instance.expects(method).with(request)
+            expect_any_instance_of(described_class.indirection.terminus(:file_server).class).to receive(method).with(request)
 
             subject.send(method, request)
           end
@@ -64,7 +62,7 @@ shared_examples_for "Puppet::FileServing::Files" do |indirection|
           it "should proxy to rest if default_file_terminus is 'rest'" do
             Puppet[:default_file_terminus] = "rest"
 
-            described_class.indirection.terminus(:rest).class.any_instance.expects(method).with(request)
+            expect_any_instance_of(described_class.indirection.terminus(:rest).class).to receive(method).with(request)
 
             subject.send(method, request)
           end