puppet 6.0.7-x64-mingw32 → 6.0.8-x64-mingw32

data/spec/unit/functions/require_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'puppet/parser/functions'
@@ -7,7 +6,6 @@ require 'matchers/resource'
 require 'matchers/include_in_order'
 require 'unit/functions/shared'
 
-
 describe 'The "require" function' do
   include PuppetSpec::Compiler
   include ContainmentMatchers
@@ -81,5 +79,4 @@ describe 'The "require" function' do
   it_should_behave_like 'all functions transforming relative to absolute names', :require
   it_should_behave_like 'an inclusion function, regardless of the type of class reference,', :require
   it_should_behave_like 'an inclusion function, when --tasks is on,', :require
-
 end

data/spec/unit/functions/shared.rb

@@ -2,19 +2,19 @@ shared_examples_for 'all functions transforming relative to absolute names' do |
   before(:each) do
     # mock that the class 'myclass' exists which are needed for the 'require' functions
     # as it checks the existence of the required class
-    @klass = stub 'class', :name => "myclass"
-    @scope.environment.known_resource_types.stubs(:find_hostclass).returns(@klass)
+    @klass = double('class', :name => "myclass")
+    allow(@scope.environment.known_resource_types).to receive(:find_hostclass).and_return(@klass)
     @resource = Puppet::Parser::Resource.new(:file, "/my/file", :scope => @scope, :source => "source")
-    @scope.stubs(:resource).returns @resource
+    allow(@scope).to receive(:resource).and_return(@resource)
   end
 
   it 'accepts a Class[name] type' do
-    @scope.compiler.expects(:evaluate_classes).with(["::myclass"], @scope, false)
+    expect(@scope.compiler).to receive(:evaluate_classes).with(["::myclass"], @scope, false)
     @scope.call_function(func_name, [Puppet::Pops::Types::TypeFactory.host_class('myclass')])
   end
 
   it 'accepts a Resource[class, name] type' do
-    @scope.compiler.expects(:evaluate_classes).with(["::myclass"], @scope, false)
+    expect(@scope.compiler).to receive(:evaluate_classes).with(["::myclass"], @scope, false)
     @scope.call_function(func_name, [Puppet::Pops::Types::TypeFactory.resource('class', 'myclass')])
   end
 
@@ -45,7 +45,6 @@ shared_examples_for 'all functions transforming relative to absolute names' do |
 end
 
 shared_examples_for 'an inclusion function, regardless of the type of class reference,' do |function|
-
     it "and #{function} a class absolutely, even when a relative namespaced class of the same name is present" do
       catalog = compile_to_catalog(<<-MANIFEST)
         class foo {
@@ -81,7 +80,6 @@ shared_examples_for 'an inclusion function, regardless of the type of class refe
       MANIFEST
       expect(catalog.classes).to include('foo','bar')
     end
-
 end
 
 shared_examples_for 'an inclusion function, when --tasks is on,' do |function|
@@ -94,4 +92,3 @@ shared_examples_for 'an inclusion function, when --tasks is on,' do |function|
     end.to raise_error(Puppet::ParseError, /is only available when compiling a catalog/)
   end
 end
-

data/spec/unit/functions/versioncmp_spec.rb

@@ -3,7 +3,6 @@ require 'puppet/pops'
 require 'puppet/loaders'
 
 describe "the versioncmp function" do
-
   before(:each) do
     loaders = Puppet::Pops::Loaders.new(Puppet::Node::Environment.create(:testing, []))
     Puppet.push_context({:loaders => loaders}, "test-examples")
@@ -28,7 +27,7 @@ describe "the versioncmp function" do
   end
 
   it "should call Puppet::Util::Package.versioncmp (included in scope)" do
-    Puppet::Util::Package.expects(:versioncmp).with('1.2', '1.3').returns(-1)
+    expect(Puppet::Util::Package).to receive(:versioncmp).with('1.2', '1.3').and_return(-1)
 
     expect(versioncmp('1.2', '1.3')).to eq(-1)
   end

data/spec/unit/functions4_spec.rb

@@ -210,12 +210,12 @@ describe 'the 4x function api' do
     end
 
     it 'a function can not be created with parameters declared after a repeated parameter' do
-      expect { create_function_with_param_after_repeated }.to raise_error(ArgumentError, 
+      expect { create_function_with_param_after_repeated }.to raise_error(ArgumentError,
         /function 't1'.*Parameters cannot be added after a repeated parameter/)
     end
 
     it 'a function can not be created with required parameters declared after optional ones' do
-      expect { create_function_with_rq_after_opt }.to raise_error(ArgumentError, 
+      expect { create_function_with_rq_after_opt }.to raise_error(ArgumentError,
         /function 't1'.*A required parameter cannot be added after an optional parameter/)
     end
 
@@ -464,7 +464,7 @@ describe 'the 4x function api' do
           # evaluate a puppet call
           source = "testing::test(10) |$x| { $x+1 }"
           program = parser.parse_string(source, __FILE__)
-          Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns(the_loader)
+          expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(the_loader)
           expect(parser.evaluate(scope, program)).to eql(11)
         end
       end
@@ -538,7 +538,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test(10)', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect { parser.evaluate({}, program) }.to raise_error(Puppet::Error,
           /value returned from function 'test' has wrong type, expects a String value, got Integer/)
       end
@@ -560,7 +560,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test(10)', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eql(10)
       end
 
@@ -579,7 +579,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test(10)', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect { parser.evaluate({}, program) }.to raise_error(Puppet::Error, /parameter 'x' references an unresolved type 'MyAlias'/)
       end
 
@@ -601,7 +601,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string('testing::test([10,20])', __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eq([10,20])
       end
 
@@ -624,7 +624,7 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string("testing::test({'x' => [10,20]})", __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eq({'x' => [10,20]})
       end
 
@@ -646,13 +646,12 @@ describe 'the 4x function api' do
         CODE
         the_loader.add_function('testing::test', fc.new({}, the_loader))
         program = parser.parse_string("testing::test({'x' => {'y' => 'n'}})", __FILE__)
-        Puppet::Pops::Adapters::LoaderAdapter.expects(:loader_for_model_object).returns(the_loader)
+        expect(Puppet::Pops::Adapters::LoaderAdapter).to receive(:loader_for_model_object).and_return(the_loader)
         expect(parser.evaluate({}, program)).to eq({'x' => {'y' => 'n'}})
       end
     end
   end
 
-
   def create_noargs_function_class
     Puppet::Functions.create_function('test') do
       def test()

data/spec/unit/gettext/config_spec.rb

@@ -19,7 +19,7 @@ describe Puppet::GettextConfig do
   end
 
   before(:each) do
-    Puppet::GettextConfig.stubs(:gettext_loaded?).returns true
+    allow(Puppet::GettextConfig).to receive(:gettext_loaded?).and_return(true)
   end
 
   after(:each) do
@@ -29,7 +29,7 @@ describe Puppet::GettextConfig do
 
   describe 'setting and getting the locale' do
     it 'should return "en" when gettext is unavailable' do
-      Puppet::GettextConfig.stubs(:gettext_loaded?).returns(false)
+      allow(Puppet::GettextConfig).to receive(:gettext_loaded?).and_return(false)
 
       expect(Puppet::GettextConfig.current_locale).to eq('en')
     end
@@ -67,7 +67,7 @@ describe Puppet::GettextConfig do
 
     context 'when given a valid locale file location' do
       it 'should return true' do
-        Puppet::GettextConfig.expects(:add_repository_to_domain).with('puppet', local_path, :po, anything)
+        expect(Puppet::GettextConfig).to receive(:add_repository_to_domain).with('puppet', local_path, :po, anything)
 
         expect(Puppet::GettextConfig.load_translations('puppet', local_path, :po)).to be true
       end
@@ -88,7 +88,7 @@ describe Puppet::GettextConfig do
     end
 
     it 'should add puppet translations to the default text domain' do
-      Puppet::GettextConfig.expects(:load_translations).with('puppet', local_path, :po, Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN).returns(true)
+      expect(Puppet::GettextConfig).to receive(:load_translations).with('puppet', local_path, :po, Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN).and_return(true)
 
       Puppet::GettextConfig.create_default_text_domain
       expect(Puppet::GettextConfig.loaded_text_domains).to include(Puppet::GettextConfig::DEFAULT_TEXT_DOMAIN)

data/spec/unit/gettext/module_loading_spec.rb

@@ -16,7 +16,7 @@ describe Puppet::ModuleTranslations do
       :metadata => {
         :author => 'foo'
       },
-      :environment => mock("environment"))
+      :environment => double("environment"))
     }
 
     let(:module_b) { PuppetSpec::Modules.create(
@@ -25,13 +25,13 @@ describe Puppet::ModuleTranslations do
       :metadata => {
         :author => 'foo'
       },
-      :environment => mock("environment"))
+      :environment => double("environment"))
     }
 
     it "should attempt to load translations only for modules that have them" do
-      module_a.expects(:has_translations?).returns(false)
-      module_b.expects(:has_translations?).returns(true)
-      Puppet::GettextConfig.expects(:load_translations).with("foo-mod_b", File.join(modpath, "mod_b", "locales"), :po).returns(true)
+      expect(module_a).to receive(:has_translations?).and_return(false)
+      expect(module_b).to receive(:has_translations?).and_return(true)
+      expect(Puppet::GettextConfig).to receive(:load_translations).with("foo-mod_b", File.join(modpath, "mod_b", "locales"), :po).and_return(true)
 
       Puppet::ModuleTranslations.load_from_modulepath([module_a, module_b])
     end
@@ -44,8 +44,8 @@ describe Puppet::ModuleTranslations do
     }
 
     it "should attempt to load translations for the current locale" do
-      Puppet::GettextConfig.expects(:current_locale).returns("ja")
-      Puppet::GettextConfig.expects(:load_translations).with("foo-mod_a", File.join(vardir, "locales"), :po).returns(true)
+      expect(Puppet::GettextConfig).to receive(:current_locale).and_return("ja")
+      expect(Puppet::GettextConfig).to receive(:load_translations).with("foo-mod_a", File.join(vardir, "locales"), :po).and_return(true)
 
       Puppet::ModuleTranslations.load_from_vardir(vardir)
     end

data/spec/unit/graph/rb_tree_map_spec.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'spec_helper'
 
 require 'puppet/graph'

data/spec/unit/graph/relationship_graph_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/graph'
 
@@ -397,6 +396,6 @@ describe Puppet::Graph::RelationshipGraph do
   end
 
   def stub_vertex(name)
-    stub "vertex #{name}", :ref => name
+    double("vertex #{name}", :ref => name)
   end
 end

data/spec/unit/graph/simple_graph_spec.rb

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/graph'
 
@@ -337,35 +336,35 @@ describe Puppet::Graph::SimpleGraph do
 
     it "should report one-vertex loops" do
       add_edges :a => :a
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a)
     end
 
     it "should report two-vertex loops" do
       add_edges :a => :b, :b => :a
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a, :b)
     end
 
     it "should report multi-vertex loops" do
       add_edges :a => :b, :b => :c, :c => :a
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[c\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[c\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a, :b, :c)
     end
 
     it "should report when a larger tree contains a small cycle" do
       add_edges :a => :b, :b => :a, :c => :a, :d => :c
-      Puppet.expects(:err).with(regexp_matches(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/))
+      expect(Puppet).to receive(:err).with(/Found 1 dependency cycle:\n\(Notify\[a\] => Notify\[b\] => Notify\[a\]\)/)
       cycle = @graph.report_cycles_in_graph.first
       expect_cycle_to_include(cycle, :a, :b)
     end
 
     it "should succeed on trees with no cycles" do
       add_edges :a => :b, :b => :e, :c => :a, :d => :c
-      Puppet.expects(:err).never
+      expect(Puppet).not_to receive(:err)
       expect(@graph.report_cycles_in_graph).to be_nil
     end
 
@@ -469,14 +468,14 @@ describe Puppet::Graph::SimpleGraph do
     end
 
     it "should only write when graphing is enabled" do
-      File.expects(:open).with(@file).never
+      expect(File).not_to receive(:open).with(@file)
       Puppet[:graph] = false
       @graph.write_graph(@name)
     end
 
     it "should write a dot file based on the passed name" do
-      File.expects(:open).with(@file, "w:UTF-8").yields(stub("file", :puts => nil))
-      @graph.expects(:to_dot).with("name" => @name.to_s.capitalize)
+      expect(File).to receive(:open).with(@file, "w:UTF-8").and_yield(double("file", :puts => nil))
+      expect(@graph).to receive(:to_dot).with("name" => @name.to_s.capitalize)
       Puppet[:graph] = true
       @graph.write_graph(@name)
     end
@@ -504,7 +503,7 @@ describe Puppet::Graph::SimpleGraph do
       # because indexing a String with a non-Integer throws an exception (and none of
       # these tests need anything meaningful from []).
       resource = "a"
-      resource.stubs(:[])
+      allow(resource).to receive(:[])
       @event = Puppet::Transaction::Event.new(:name => :yay, :resource => resource)
       @none = Puppet::Transaction::Event.new(:name => :NONE, :resource => resource)
 

data/spec/unit/hiera_puppet_spec.rb

@@ -16,8 +16,8 @@ describe 'HieraPuppet' do
 
     context "when the hiera_config_file exists" do
       before do
-        Hiera::Config.expects(:load).returns(hiera_config_data)
-        HieraPuppet.expects(:hiera_config_file).returns(true)
+        expect(Hiera::Config).to receive(:load).and_return(hiera_config_data)
+        expect(HieraPuppet).to receive(:hiera_config_file).and_return(true)
       end
 
       it "should return a configuration hash" do
@@ -31,8 +31,8 @@ describe 'HieraPuppet' do
 
     context "when the hiera_config_file does not exist" do
       before do
-        Hiera::Config.expects(:load).never
-        HieraPuppet.expects(:hiera_config_file).returns(nil)
+        expect(Hiera::Config).not_to receive(:load)
+        expect(HieraPuppet).to receive(:hiera_config_file).and_return(nil)
       end
 
       it "should return a configuration hash" do
@@ -59,7 +59,7 @@ describe 'HieraPuppet' do
         pending("This example does not apply to Puppet #{Puppet.version} because it does not have this setting")
       end
 
-      Puppet::FileSystem.stubs(:exist?).with(Puppet[:hiera_config]).returns(true)
+      allow(Puppet::FileSystem).to receive(:exist?).with(Puppet[:hiera_config]).and_return(true)
       expect(HieraPuppet.send(:hiera_config_file)).to eq(Puppet[:hiera_config])
     end
 
@@ -75,29 +75,29 @@ describe 'HieraPuppet' do
       end
 
       it "should use Puppet.settings[:codedir]/hiera.yaml when '$codedir/hiera.yaml' exists and '$confdir/hiera.yaml' does not exist" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(false)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(code_hiera_config)
       end
 
       it "should use Puppet.settings[:confdir]/hiera.yaml when '$codedir/hiera.yaml' does not exist and '$confdir/hiera.yaml' exists" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(false)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(true)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(conf_hiera_config)
       end
 
       it "should use Puppet.settings[:codedir]/hiera.yaml when '$codedir/hiera.yaml' exists and '$confdir/hiera.yaml' exists" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(true)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(code_hiera_config)
       end
 
       it "should return nil when neither '$codedir/hiera.yaml' nor '$confdir/hiera.yaml' exists" do
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(false)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(false)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(false)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(nil)
       end
@@ -109,9 +109,9 @@ describe 'HieraPuppet' do
           explicit_hiera_config = '/an/explicit/hiera.yaml'
         end
         Puppet.settings[:hiera_config] = explicit_hiera_config
-        Puppet::FileSystem.stubs(:exist?).with(explicit_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(code_hiera_config).returns(true)
-        Puppet::FileSystem.stubs(:exist?).with(conf_hiera_config).returns(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(explicit_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(code_hiera_config).and_return(true)
+        allow(Puppet::FileSystem).to receive(:exist?).with(conf_hiera_config).and_return(true)
 
         expect(HieraPuppet.send(:hiera_config_file)).to eq(explicit_hiera_config)
       end
@@ -126,18 +126,18 @@ describe 'HieraPuppet' do
     end
 
     it "should return the value from Hiera" do
-      Hiera.any_instance.stubs(:lookup).returns('8080')
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return('8080')
       expect(HieraPuppet.lookup('port', nil, scope, nil, :priority)).to eq('8080')
 
-      Hiera.any_instance.stubs(:lookup).returns(['foo', 'bar'])
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return(['foo', 'bar'])
       expect(HieraPuppet.lookup('ntpservers', nil, scope, nil, :array)).to eq(['foo', 'bar'])
 
-      Hiera.any_instance.stubs(:lookup).returns({'uid' => '1000'})
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return({'uid' => '1000'})
       expect(HieraPuppet.lookup('user', nil, scope, nil, :hash)).to eq({'uid' => '1000'})
     end
 
     it "should raise a useful error when the answer is nil" do
-      Hiera.any_instance.stubs(:lookup).returns(nil)
+      allow_any_instance_of(Hiera).to receive(:lookup).and_return(nil)
       expect do
         HieraPuppet.lookup('port', nil, scope, nil, :priority)
       end.to raise_error(Puppet::ParseError,

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

@@ -1,4 +1,3 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 require 'matchers/resource'
@@ -11,14 +10,14 @@ describe Puppet::Resource::Catalog::Compiler do
   let(:node) { Puppet::Node.new(node_name)}
 
   before do
-    Facter.stubs(:to_hash).returns({})
+    allow(Facter).to receive(:to_hash).and_return({})
   end
 
   describe "when initializing" do
     before do
-      Puppet.expects(:version).returns(1)
-      Facter.expects(:value).with('fqdn').returns("my.server.com")
-      Facter.expects(:value).with('ipaddress').returns("my.ip.address")
+      expect(Puppet).to receive(:version).and_return(1)
+      expect(Facter).to receive(:value).with('fqdn').and_return("my.server.com")
+      expect(Facter).to receive(:value).with('ipaddress').and_return("my.ip.address")
     end
 
     it "should gather data about itself" do
@@ -30,7 +29,7 @@ describe Puppet::Resource::Catalog::Compiler do
       Puppet::Node.indirection.save(Puppet::Node.new("node1"))
       Puppet::Node.indirection.save(Puppet::Node.new("node2"))
 
-      compiler.stubs(:compile)
+      allow(compiler).to receive(:compile)
 
       compiler.find(Puppet::Indirector::Request.new(:catalog, :find, 'node1', nil, :node => 'node1'))
       compiler.find(Puppet::Indirector::Request.new(:catalog, :find, 'node2', nil, :node => 'node2'))
@@ -39,71 +38,71 @@ describe Puppet::Resource::Catalog::Compiler do
 
   describe "when finding catalogs" do
     before do
-      Facter.stubs(:value).returns("whatever")
+      allow(Facter).to receive(:value).and_return("whatever")
 
-      node.stubs(:merge)
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(node).to receive(:merge)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil, :node => node_name)
     end
 
     it "should directly use provided nodes for a local request" do
-      Puppet::Node.indirection.expects(:find).never
-      compiler.expects(:compile).with(node, anything)
-      @request.stubs(:options).returns(:use_node => node)
-      @request.stubs(:remote?).returns(false)
+      expect(Puppet::Node.indirection).not_to receive(:find)
+      expect(compiler).to receive(:compile).with(node, anything)
+      allow(@request).to receive(:options).and_return(:use_node => node)
+      allow(@request).to receive(:remote?).and_return(false)
       compiler.find(@request)
     end
 
     it "rejects a provided node if the request is remote" do
-      @request.stubs(:options).returns(:use_node => node)
-      @request.stubs(:remote?).returns(true)
+      allow(@request).to receive(:options).and_return(:use_node => node)
+      allow(@request).to receive(:remote?).and_return(true)
       expect {
         compiler.find(@request)
       }.to raise_error Puppet::Error, /invalid option use_node/i
     end
 
     it "should use the authenticated node name if no request key is provided" do
-      @request.stubs(:key).returns(nil)
-      Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
-      compiler.expects(:compile).with(node, anything)
+      allow(@request).to receive(:key).and_return(nil)
+      expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
+      expect(compiler).to receive(:compile).with(node, anything)
       compiler.find(@request)
     end
 
     it "should use the provided node name by default" do
-      @request.expects(:key).returns "my_node"
+      expect(@request).to receive(:key).and_return("my_node")
 
-      Puppet::Node.indirection.expects(:find).with("my_node", anything).returns node
-      compiler.expects(:compile).with(node, anything)
+      expect(Puppet::Node.indirection).to receive(:find).with("my_node", anything).and_return(node)
+      expect(compiler).to receive(:compile).with(node, anything)
       compiler.find(@request)
     end
 
     it "should fail if no node is passed and none can be found" do
-      Puppet::Node.indirection.stubs(:find).with(node_name, anything).returns(nil)
+      allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(nil)
       expect { compiler.find(@request) }.to raise_error(ArgumentError)
     end
 
     it "should fail intelligently when searching for a node raises an exception" do
-      Puppet::Node.indirection.stubs(:find).with(node_name, anything).raises "eh"
+      allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_raise("eh")
       expect { compiler.find(@request) }.to raise_error(Puppet::Error)
     end
 
     it "should pass the found node to the compiler for compiling" do
-      Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
-      Puppet::Parser::Compiler.expects(:compile).with(node, anything)
+      expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
+      expect(Puppet::Parser::Compiler).to receive(:compile).with(node, anything)
       compiler.find(@request)
     end
 
     it "should pass node containing percent character to the compiler" do
       node_with_percent_character = Puppet::Node.new "%6de"
-      Puppet::Node.indirection.stubs(:find).returns(node_with_percent_character)
-      Puppet::Parser::Compiler.expects(:compile).with(node_with_percent_character, anything)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node_with_percent_character)
+      expect(Puppet::Parser::Compiler).to receive(:compile).with(node_with_percent_character, anything)
       compiler.find(@request)
     end
 
     it "should extract any facts from the request" do
-      Puppet::Node.indirection.expects(:find).with(node_name, anything).returns node
-      compiler.expects(:extract_facts_from_request).with(@request)
-      Puppet::Parser::Compiler.stubs(:compile)
+      expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
+      expect(compiler).to receive(:extract_facts_from_request).with(@request)
+      allow(Puppet::Parser::Compiler).to receive(:compile)
       compiler.find(@request)
     end
 
@@ -126,119 +125,119 @@ describe Puppet::Resource::Catalog::Compiler do
     end
 
     it "should return the results of compiling as the catalog" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       catalog = Puppet::Resource::Catalog.new(node.name)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
       expect(compiler.find(@request)).to equal(catalog)
     end
 
     it "passes the code_id from the request to the compiler" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
       @request.options[:code_id] = code_id
 
-      Puppet::Parser::Compiler.expects(:compile).with(anything, code_id)
+      expect(Puppet::Parser::Compiler).to receive(:compile).with(anything, code_id)
 
       compiler.find(@request)
     end
 
     it "returns a catalog with the code_id from the request" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       code_id = 'b59e5df0578ef411f773ee6c33d8073c50e7b8fe'
       @request.options[:code_id] = code_id
 
       catalog = Puppet::Resource::Catalog.new(node.name, node.environment, code_id)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
       expect(compiler.find(@request).code_id).to eq(code_id)
     end
 
     it "does not inline metadata when the static_catalog option is false" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = false
       @request.options[:code_id] = 'some_code_id'
-      node.environment.stubs(:static_catalogs?).returns true
+      allow(node.environment).to receive(:static_catalogs?).and_return(true)
 
       catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
-      compiler.expects(:inline_metadata).never
+      expect(compiler).not_to receive(:inline_metadata)
       compiler.find(@request)
     end
 
     it "does not inline metadata when static_catalogs are disabled" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = true
       @request.options[:checksum_type] = 'md5'
       @request.options[:code_id] = 'some_code_id'
-      node.environment.stubs(:static_catalogs?).returns false
+      allow(node.environment).to receive(:static_catalogs?).and_return(false)
 
       catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
-      compiler.expects(:inline_metadata).never
+      expect(compiler).not_to receive(:inline_metadata)
       compiler.find(@request)
     end
 
     it "does not inline metadata when code_id is not specified" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = true
       @request.options[:checksum_type] = 'md5'
-      node.environment.stubs(:static_catalogs?).returns true
+      allow(node.environment).to receive(:static_catalogs?).and_return(true)
 
       catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
-      compiler.expects(:inline_metadata).never
+      expect(compiler).not_to receive(:inline_metadata)
       expect(compiler.find(@request)).to eq(catalog)
     end
 
     it "inlines metadata when the static_catalog option is true, static_catalogs are enabled, and a code_id is provided" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = true
       @request.options[:checksum_type] = 'sha256'
       @request.options[:code_id] = 'some_code_id'
-      node.environment.stubs(:static_catalogs?).returns true
+      allow(node.environment).to receive(:static_catalogs?).and_return(true)
 
       catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
-      compiler.expects(:inline_metadata).with(catalog, :sha256).returns catalog
+      expect(compiler).to receive(:inline_metadata).with(catalog, :sha256).and_return(catalog)
       compiler.find(@request)
     end
 
     it "inlines metadata with the first common checksum type" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = true
       @request.options[:checksum_type] = 'atime.md5.sha256.mtime'
       @request.options[:code_id] = 'some_code_id'
-      node.environment.stubs(:static_catalogs?).returns true
+      allow(node.environment).to receive(:static_catalogs?).and_return(true)
 
       catalog = Puppet::Resource::Catalog.new(node.name, node.environment)
-      Puppet::Parser::Compiler.stubs(:compile).returns catalog
+      allow(Puppet::Parser::Compiler).to receive(:compile).and_return(catalog)
 
-      compiler.expects(:inline_metadata).with(catalog, :md5).returns catalog
+      expect(compiler).to receive(:inline_metadata).with(catalog, :md5).and_return(catalog)
       compiler.find(@request)
     end
 
     it "errors if checksum_type contains no shared checksum types" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = true
       @request.options[:checksum_type] = 'atime.md2'
       @request.options[:code_id] = 'some_code_id'
-      node.environment.stubs(:static_catalogs?).returns true
+      allow(node.environment).to receive(:static_catalogs?).and_return(true)
 
       expect { compiler.find(@request) }.to raise_error Puppet::Error,
         "Unable to find a common checksum type between agent 'atime.md2' and master '[:sha256, :sha256lite, :md5, :md5lite, :sha1, :sha1lite, :sha512, :sha384, :sha224, :mtime, :ctime, :none]'."
     end
 
     it "errors if checksum_type contains no shared checksum types" do
-      Puppet::Node.indirection.stubs(:find).returns(node)
+      allow(Puppet::Node.indirection).to receive(:find).and_return(node)
       @request.options[:static_catalog] = true
       @request.options[:checksum_type] = nil
       @request.options[:code_id] = 'some_code_id'
-      node.environment.stubs(:static_catalogs?).returns true
+      allow(node.environment).to receive(:static_catalogs?).and_return(true)
 
       expect { compiler.find(@request) }.to raise_error Puppet::Error,
         "Unable to find a common checksum type between agent '' and master '[:sha256, :sha256lite, :md5, :md5lite, :sha1, :sha1lite, :sha512, :sha384, :sha224, :mtime, :ctime, :none]'."
@@ -248,7 +247,7 @@ describe Puppet::Resource::Catalog::Compiler do
   describe "when handling a request with facts" do
     before do
       Puppet::Node::Facts.indirection.terminus_class = :memory
-      Facter.stubs(:value).returns "something"
+      allow(Facter).to receive(:value).and_return("something")
 
       @facts = Puppet::Node::Facts.new('hostname', "fact" => "value", "architecture" => "i386")
     end
@@ -317,7 +316,7 @@ describe Puppet::Resource::Catalog::Compiler do
           :transaction_uuid => request.options[:transaction_uuid],
         }
 
-        Puppet::Node::Facts.indirection.expects(:save).with(equals(@facts), nil, options)
+        expect(Puppet::Node::Facts.indirection).to receive(:save).with(@facts, nil, options)
         compiler.find(request)
       end
 
@@ -329,7 +328,7 @@ describe Puppet::Resource::Catalog::Compiler do
           :transaction_uuid => request.options[:transaction_uuid],
         }
 
-        Puppet::Node::Facts.indirection.expects(:save).with(equals(@facts), nil, options).never
+        expect(Puppet::Node::Facts.indirection).not_to receive(:save).with(@facts, nil, options)
         compiler.find(request)
       end
     end
@@ -337,53 +336,53 @@ describe Puppet::Resource::Catalog::Compiler do
 
   describe "when finding nodes" do
     it "should look node information up via the Node class with the provided key" do
-      Facter.stubs(:value).returns("whatever")
+      allow(Facter).to receive(:value).and_return("whatever")
       request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
-      compiler.stubs(:compile)
+      allow(compiler).to receive(:compile)
 
-      Puppet::Node.indirection.expects(:find).with(node_name, anything).returns(node)
+      expect(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
 
       compiler.find(request)
     end
 
     it "should pass the transaction_uuid to the node indirection" do
       uuid = '793ff10d-89f8-4527-a645-3302cbc749f3'
-      compiler.stubs(:compile)
+      allow(compiler).to receive(:compile)
       request = Puppet::Indirector::Request.new(:catalog, :find, node_name,
                                                 nil, :transaction_uuid => uuid)
 
-      Puppet::Node.indirection.expects(:find).with(
+      expect(Puppet::Node.indirection).to receive(:find).with(
         node_name,
-        has_entries(:transaction_uuid => uuid)
-      ).returns(node)
+        hash_including(:transaction_uuid => uuid)
+      ).and_return(node)
 
       compiler.find(request)
     end
 
     it "should pass the configured_environment to the node indirection" do
       environment = 'foo'
-      compiler.stubs(:compile)
+      allow(compiler).to receive(:compile)
       request = Puppet::Indirector::Request.new(:catalog, :find, node_name,
                                                 nil, :configured_environment => environment)
 
-      Puppet::Node.indirection.expects(:find).with(
+      expect(Puppet::Node.indirection).to receive(:find).with(
         node_name,
-        has_entries(:configured_environment => environment)
-      ).returns(node)
+        hash_including(:configured_environment => environment)
+      ).and_return(node)
 
       compiler.find(request)
     end
 
     it "should pass a facts object from the original request facts to the node indirection" do
       facts = Puppet::Node::Facts.new("hostname", :afact => "avalue")
-      compiler.expects(:extract_facts_from_request).returns(facts)
-      compiler.expects(:save_facts_from_request)
+      expect(compiler).to receive(:extract_facts_from_request).and_return(facts)
+      expect(compiler).to receive(:save_facts_from_request)
 
       request = Puppet::Indirector::Request.new(:catalog, :find, "hostname",
                                                 nil, :facts_format => "application/json",
                                                 :facts => facts.render('json'))
 
-      Puppet::Node.indirection.expects(:find).with("hostname", has_entries(:facts => facts)).returns(node)
+      expect(Puppet::Node.indirection).to receive(:find).with("hostname", hash_including(:facts => facts)).and_return(node)
 
       compiler.find(request)
     end
@@ -391,62 +390,61 @@ describe Puppet::Resource::Catalog::Compiler do
 
   describe "after finding nodes" do
     before do
-      Puppet.expects(:version).returns(1)
-      Facter.expects(:value).with('fqdn').returns("my.server.com")
-      Facter.expects(:value).with('ipaddress').returns("my.ip.address")
+      expect(Puppet).to receive(:version).and_return(1)
+      expect(Facter).to receive(:value).with('fqdn').and_return("my.server.com")
+      expect(Facter).to receive(:value).with('ipaddress').and_return("my.ip.address")
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
-      compiler.stubs(:compile)
-      Puppet::Node.indirection.stubs(:find).with(node_name, anything).returns(node)
+      allow(compiler).to receive(:compile)
+      allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
     end
 
     it "should add the server's Puppet version to the node's parameters as 'serverversion'" do
-      node.expects(:merge).with { |args| args["serverversion"] == "1" }
+      expect(node).to receive(:merge).with(hash_including("serverversion" => "1"))
       compiler.find(@request)
     end
 
     it "should add the server's fqdn to the node's parameters as 'servername'" do
-      node.expects(:merge).with { |args| args["servername"] == "my.server.com" }
+      expect(node).to receive(:merge).with(hash_including("servername" => "my.server.com"))
       compiler.find(@request)
     end
 
     it "should add the server's IP address to the node's parameters as 'serverip'" do
-      node.expects(:merge).with { |args| args["serverip"] == "my.ip.address" }
+      expect(node).to receive(:merge).with(hash_including("serverip" => "my.ip.address"))
       compiler.find(@request)
     end
   end
 
   describe "when filtering resources" do
     before :each do
-      Facter.stubs(:value)
-      @catalog = stub_everything 'catalog'
-      @catalog.stubs(:respond_to?).with(:filter).returns(true)
+      allow(Facter).to receive(:value)
+      @catalog = double('catalog')
+      allow(@catalog).to receive(:respond_to?).with(:filter).and_return(true)
     end
 
     it "should delegate to the catalog instance filtering" do
-      @catalog.expects(:filter)
+      expect(@catalog).to receive(:filter)
       compiler.filter(@catalog)
     end
 
     it "should filter out virtual resources" do
-      resource = mock 'resource', :virtual? => true
-      @catalog.stubs(:filter).yields(resource)
+      resource = double('resource', :virtual? => true)
+      allow(@catalog).to receive(:filter).and_yield(resource)
 
       compiler.filter(@catalog)
     end
 
     it "should return the same catalog if it doesn't support filtering" do
-      @catalog.stubs(:respond_to?).with(:filter).returns(false)
+      allow(@catalog).to receive(:respond_to?).with(:filter).and_return(false)
 
       expect(compiler.filter(@catalog)).to eq(@catalog)
     end
 
     it "should return the filtered catalog" do
-      catalog = stub 'filtered catalog'
-      @catalog.stubs(:filter).returns(catalog)
+      catalog = double('filtered catalog')
+      allow(@catalog).to receive(:filter).and_return(catalog)
 
       expect(compiler.filter(@catalog)).to eq(catalog)
     end
-
   end
 
   describe "when inlining metadata" do
@@ -461,33 +459,33 @@ describe Puppet::Resource::Catalog::Compiler do
     def stubs_resource_metadata(ftype, relative_path, full_path = nil)
       full_path ||=  File.join(Puppet[:environmentpath], 'production', relative_path)
 
-      metadata = stub 'metadata'
-      metadata.stubs(:ftype).returns(ftype)
-      metadata.stubs(:full_path).returns(full_path)
-      metadata.stubs(:relative_path).returns(relative_path)
-      metadata.stubs(:source).returns("puppet:///#{relative_path}")
-      metadata.stubs(:source=)
-      metadata.stubs(:content_uri=)
+      metadata = double('metadata')
+      allow(metadata).to receive(:ftype).and_return(ftype)
+      allow(metadata).to receive(:full_path).and_return(full_path)
+      allow(metadata).to receive(:relative_path).and_return(relative_path)
+      allow(metadata).to receive(:source).and_return("puppet:///#{relative_path}")
+      allow(metadata).to receive(:source=)
+      allow(metadata).to receive(:content_uri=)
 
       metadata
     end
 
     def stubs_file_metadata(checksum_type, sha, relative_path, full_path = nil)
       metadata = stubs_resource_metadata('file', relative_path, full_path)
-      metadata.stubs(:checksum).returns("{#{checksum_type}}#{sha}")
-      metadata.stubs(:checksum_type).returns(checksum_type)
+      allow(metadata).to receive(:checksum).and_return("{#{checksum_type}}#{sha}")
+      allow(metadata).to receive(:checksum_type).and_return(checksum_type)
       metadata
     end
 
     def stubs_link_metadata(relative_path, destination)
       metadata = stubs_resource_metadata('link', relative_path)
-      metadata.stubs(:destination).returns(destination)
+      allow(metadata).to receive(:destination).and_return(destination)
       metadata
     end
 
     def stubs_directory_metadata(relative_path)
       metadata = stubs_resource_metadata('directory', relative_path)
-      metadata.stubs(:relative_path).returns('.')
+      allow(metadata).to receive(:relative_path).and_return('.')
       metadata
     end
 
@@ -500,8 +498,8 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
-      metadata.expects(:source=).with(source)
-      metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
+      expect(metadata).to receive(:source=).with(source)
+      expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
 
       options = {
         :environment => catalog.environment_instance,
@@ -509,7 +507,7 @@ describe Puppet::Resource::Catalog::Compiler do
         :checksum_type => checksum_type.to_sym,
         :source_permissions => :ignore
       }
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -528,8 +526,8 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_link_metadata('modules/mymodule/files/config_file.txt', '/tmp/some/absolute/path')
-      metadata.expects(:source=).with(source)
-      metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
+      expect(metadata).to receive(:source=).with(source)
+      expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
 
       options = {
         :environment        => catalog.environment_instance,
@@ -537,7 +535,7 @@ describe Puppet::Resource::Catalog::Compiler do
         :checksum_type      => checksum_type.to_sym,
         :source_permissions => :use
       }
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -568,7 +566,7 @@ describe Puppet::Resource::Catalog::Compiler do
         :source_permissions => default_file[:source_permissions]
       }
 
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
     end
@@ -583,10 +581,10 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
-      metadata.expects(:source=).with(source)
-      metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(alt_source, anything).returns(nil)
+      expect(metadata).to receive(:source=).with(source)
+      expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/config_file.txt')
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(alt_source, anything).and_return(nil)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -613,7 +611,7 @@ describe Puppet::Resource::Catalog::Compiler do
             :checksum_type      => checksum_type.to_sym,
             :source_permissions => :ignore
           }
-          Puppet::FileServing::Metadata.indirection.expects(:find).with(source, options).returns(metadata)
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, options).and_return(metadata)
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -634,11 +632,11 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
-      metadata.stubs(:source).returns(source)
+      allow(metadata).to receive(:source).and_return(source)
 
-      metadata.expects(:content_uri=).with('puppet://myhost:8888/modules/mymodule/files/config_file.txt')
+      expect(metadata).to receive(:content_uri=).with('puppet://myhost:8888/modules/mymodule/files/config_file.txt')
 
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
     end
@@ -705,7 +703,7 @@ describe Puppet::Resource::Catalog::Compiler do
 
       full_path = File.join(Puppet[:codedir], "modules/mymodule/files/config_file.txt")
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt', full_path)
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata).to be_empty
@@ -723,7 +721,7 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'secure/files/data.txt')
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata).to be_empty
@@ -739,7 +737,7 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/not_in_files/config_file.txt')
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata).to be_empty
@@ -756,7 +754,7 @@ describe Puppet::Resource::Catalog::Compiler do
 
       # note empty module name "modules//files"
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules//files/config_file.txt')
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata).to be_empty
@@ -776,9 +774,9 @@ describe Puppet::Resource::Catalog::Compiler do
 
       # See https://github.com/puppetlabs/control-repo/blob/508b9cc/site/profile/files/puppetmaster/update-classes.sh
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'site/profile/files/puppetmaster/update-classes.sh')
-      metadata.stubs(:source).returns(source)
+      allow(metadata).to receive(:source).and_return(source)
 
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata[path]).to eq(metadata)
@@ -798,9 +796,9 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/myfile')
-      metadata.stubs(:source).returns(source)
+      allow(metadata).to receive(:source).and_return(source)
 
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata[path]).to eq(metadata)
@@ -820,8 +818,8 @@ describe Puppet::Resource::Catalog::Compiler do
             }
           MANIFEST
 
-          metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/directory')
-          Puppet::FileServing::Metadata.indirection.expects(:find).with(source_dir, anything).returns(metadata)
+          expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/directory')
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source_dir, anything).and_return(metadata)
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -842,8 +840,8 @@ describe Puppet::Resource::Catalog::Compiler do
             }
           MANIFEST
 
-          metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/directory')
-          child_metadata.expects(:content_uri=).with('puppet:///modules/mymodule/files/directory/myfile.txt')
+          expect(metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/directory')
+          expect(child_metadata).to receive(:content_uri=).with('puppet:///modules/mymodule/files/directory/myfile.txt')
 
           options = {
             :environment        => catalog.environment_instance,
@@ -854,7 +852,7 @@ describe Puppet::Resource::Catalog::Compiler do
             :recurselimit       => nil,
             :ignore             => nil,
           }
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, options).returns([metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, options).and_return([metadata, child_metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -885,7 +883,7 @@ describe Puppet::Resource::Catalog::Compiler do
             :recurselimit       => 2,
             :ignore             => 'foo.+',
           }
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, options).returns([metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, options).and_return([metadata, child_metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -904,8 +902,8 @@ describe Puppet::Resource::Catalog::Compiler do
             }
           MANIFEST
 
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, anything).returns([metadata, child_metadata])
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(alt_source_dir, anything).returns([metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, anything).and_return([metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(alt_source_dir, anything).and_return([metadata, child_metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -924,8 +922,8 @@ describe Puppet::Resource::Catalog::Compiler do
             }
           MANIFEST
 
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source_dir, anything).returns(nil)
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(alt_source_dir, anything).returns([metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source_dir, anything).and_return(nil)
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(alt_source_dir, anything).and_return([metadata, child_metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -946,9 +944,9 @@ describe Puppet::Resource::Catalog::Compiler do
           MANIFEST
 
           metadata = stubs_directory_metadata('secure/files/data')
-          metadata.stubs(:source).returns(source)
+          allow(metadata).to receive(:source).and_return(source)
 
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
           expect(catalog.metadata).to be_empty
@@ -967,7 +965,7 @@ describe Puppet::Resource::Catalog::Compiler do
           MANIFEST
 
           metadata = stubs_directory_metadata('modules/mymodule/not_in_files/directory')
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
           expect(catalog.metadata).to be_empty
@@ -988,12 +986,12 @@ describe Puppet::Resource::Catalog::Compiler do
 
           # See https://github.com/puppetlabs/control-repo/blob/508b9cc/site/profile/files/puppetmaster/update-classes.sh
           dir_metadata = stubs_directory_metadata('site/profile/files/puppetmaster')
-          dir_metadata.stubs(:source).returns(source)
+          allow(dir_metadata).to receive(:source).and_return(source)
 
           child_metadata = stubs_file_metadata(checksum_type, checksum_value, './update-classes.sh')
-          child_metadata.stubs(:source).returns("#{source}/update-classes.sh")
+          allow(child_metadata).to receive(:source).and_return("#{source}/update-classes.sh")
 
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([dir_metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([dir_metadata, child_metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
           expect(catalog.metadata).to be_empty
@@ -1012,12 +1010,12 @@ describe Puppet::Resource::Catalog::Compiler do
           MANIFEST
 
           dir_metadata = stubs_directory_metadata('modules/mymodule/files/directory')
-          dir_metadata.stubs(:source).returns(source)
+          allow(dir_metadata).to receive(:source).and_return(source)
 
           child_metadata = stubs_file_metadata(checksum_type, checksum_value, './file')
-          child_metadata.stubs(:source).returns("#{source}/file")
+          allow(child_metadata).to receive(:source).and_return("#{source}/file")
 
-          Puppet::FileServing::Metadata.indirection.expects(:search).with(source, anything).returns([dir_metadata, child_metadata])
+          expect(Puppet::FileServing::Metadata.indirection).to receive(:search).with(source, anything).and_return([dir_metadata, child_metadata])
 
           compiler.send(:inline_metadata, catalog, checksum_type)
 
@@ -1046,7 +1044,7 @@ describe Puppet::Resource::Catalog::Compiler do
       MANIFEST
 
       metadata = stubs_file_metadata(checksum_type, checksum_value, 'modules/mymodule/files/config_file.txt')
-      Puppet::FileServing::Metadata.indirection.expects(:find).with(source, anything).returns(metadata)
+      expect(Puppet::FileServing::Metadata.indirection).to receive(:find).with(source, anything).and_return(metadata)
 
       compiler.send(:inline_metadata, catalog, checksum_type)
       expect(catalog.metadata['c:/foo']).to eq(metadata)