puppet 5.5.22 → 6.0.0

data/spec/unit/capability_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet_spec/compiler'
 
@@ -8,18 +9,17 @@ describe 'Capability types' do
   let(:loaders) { Puppet::Pops::Loaders.new(env) }
 
   before(:each) do
-    allow_any_instance_of(Puppet::Parser::Compiler).to receive(:loaders).and_return(loaders)
+    Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
+    Puppet.push_context({:loaders => loaders, :current_environment => env})
+    Puppet::Type.newtype :cap, :is_capability => true do
+      newparam :name
+      newparam :host
+    end
   end
 
-  around :each do |example|
-    Puppet.override(:loaders => loaders, :current_environment => env) do
-      Puppet::Type.newtype :cap, :is_capability => true do
-        newparam :name
-        newparam :host
-      end
-      example.run
-      Puppet::Type.rmtype(:cap)
-    end
+  after(:each) do
+    Puppet::Type.rmtype(:cap)
+    Puppet.pop_context()
   end
 
   context 'annotations' do
@@ -86,7 +86,7 @@ describe 'Capability types' do
       parse_results << parser.parse
 
       main = Puppet::Parser::AST::Hostclass.new('', :code => Puppet::Parser::ParserFactory.code_merger.concatenate(parse_results))
-      allow_any_instance_of(Puppet::Node::Environment).to receive(:perform_initial_import).and_return(main)
+      Puppet::Node::Environment.any_instance.stubs(:perform_initial_import).returns main
 
       type = compile_to_catalog(nil).environment_instance.known_resource_types.definition(:test)
       expect(type.produces).to be_instance_of(Array)
@@ -120,7 +120,7 @@ describe 'Capability types' do
       parse_results << parser.parse
 
       main = Puppet::Parser::AST::Hostclass.new('', :code => Puppet::Parser::ParserFactory.code_merger.concatenate(parse_results))
-     allow_any_instance_of(Puppet::Node::Environment).to receive(:perform_initial_import).and_return(main)
+      Puppet::Node::Environment.any_instance.stubs(:perform_initial_import).returns main
 
       type = compile_to_catalog(nil).environment_instance.known_resource_types.definition('Mod::Test')
       expect(type.produces).to be_instance_of(Array)
@@ -131,7 +131,6 @@ describe 'Capability types' do
       expect(cns[:mappings]).to be_instance_of(Hash)
       expect(cns[:mappings]['host']).to be_instance_of(Puppet::Parser::AST::PopsBridge::Expression)
     end
-
     it "does not allow operator '+>' in a mapping" do
       expect do
       compile_to_catalog(<<-MANIFEST, node)
@@ -257,12 +256,12 @@ test { one: hostname => "ahost", export => Cap[two] }
     def mock_cap_finding
       cap = Puppet::Resource.new("Cap", "two")
       cap["host"] = "ahost"
-      expect(Puppet::Resource::CapabilityFinder).to receive(:find).and_return(cap)
+      Puppet::Resource::CapabilityFinder.expects(:find).returns(cap)
       cap
     end
 
     it "does not fetch a consumed resource when consume metaparam not set" do
-      expect(Puppet::Resource::CapabilityFinder).not_to receive(:find)
+      Puppet::Resource::CapabilityFinder.expects(:find).never
       catalog = make_catalog("test { one: }")
       expect(catalog.resource_keys.find { |type, _| type == "Cap" }).to be_nil
       expect(catalog.resource("Test", "one")["hostname"]).to eq("nohost")
@@ -394,7 +393,7 @@ test { one: hostname => "ahost", export => Cap[two] }
   end
 
   context 'and aliased resources' do
-    let(:drive) { Puppet.features.microsoft_windows? ? 'C:' : '' }
+    let(:drive) { Puppet::Util::Platform.windows? ? 'C:' : '' }
     let(:code) { <<-PUPPET }
       $dir='#{drive}/tmp/test'
       $same_dir='#{drive}/tmp/test/'

data/spec/unit/{ssl/certificate_factory_spec.rb → certificate_factory_spec.rb}

@@ -1,8 +1,10 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
+require 'puppet/test_ca'
 
-require 'puppet/ssl/certificate_factory'
+require 'puppet/certificate_factory'
 
-describe Puppet::SSL::CertificateFactory do
+describe Puppet::CertificateFactory, :unless => RUBY_PLATFORM == 'java' do
   let :serial    do OpenSSL::BN.new('12') end
   let :name      do "example.local" end
   let :x509_name do OpenSSL::X509::Name.new([['CN', name]]) end
@@ -12,17 +14,15 @@ describe Puppet::SSL::CertificateFactory do
     csr.generate(key)
     csr
   end
-  let :issuer do
-    cert = Puppet::SSL::CertificateAuthority.new
-    cert.generate_ca_certificate
-    cert.host.certificate.content
-  end
+  let(:issuer) { Puppet::TestCa.new.ca_cert }
 
   describe "when generating the certificate" do
     it "should return a new X509 certificate" do
-      expect(subject.build(:server, csr, issuer, serial)).not_to eq(
-        subject.build(:server, csr, issuer, serial)
-      )
+      a = subject.build(:server, csr, issuer, serial)
+      b = subject.build(:server, csr, issuer, serial)
+      # The two instances are equal in every aspect except that they are 
+      # different instances - they are `==`, but not hash `eql?`
+      expect(a).not_to eql(b)
     end
 
     it "should set the certificate's version to 2" do
@@ -55,14 +55,6 @@ describe Puppet::SSL::CertificateFactory do
       expect(cert.not_before).to be_within(30).of(Time.now - 24*60*60)
     end
 
-    it "should set the default TTL of the certificate to the `ca_ttl` setting" do
-      Puppet[:ca_ttl] = 12
-      now = Time.now.utc
-      expect(Time).to receive(:now).at_least(:once).and_return(now)
-      cert = subject.build(:server, csr, issuer, serial)
-      expect(cert.not_after.to_i).to eq(now.to_i + 12)
-    end
-
     it "should not allow a non-integer TTL" do
       [ 'foo', 1.2, Time.now, true ].each do |ttl|
         expect { subject.build(:server, csr, issuer, serial, ttl) }.to raise_error(ArgumentError)
@@ -71,7 +63,7 @@ describe Puppet::SSL::CertificateFactory do
 
     it "should respect a custom TTL for the CA" do
       now = Time.now.utc
-      expect(Time).to receive(:now).at_least(:once).and_return(now)
+      Time.expects(:now).at_least_once.returns(now)
       cert = subject.build(:server, csr, issuer, serial, 12)
       expect(cert.not_after.to_i).to eq(now.to_i + 12)
     end
@@ -95,6 +87,7 @@ describe Puppet::SSL::CertificateFactory do
       )
     end
 
+
     it "should add an extension for the authorityKeyIdentifer" do
       cert = subject.build(:server, csr, issuer, serial)
       ef = OpenSSL::X509::ExtensionFactory.new(issuer, cert)
@@ -138,7 +131,7 @@ describe Puppet::SSL::CertificateFactory do
       csr = Puppet::SSL::CertificateRequest.new(name)
       csr.generate(key)
 
-      allow(csr).to receive(:request_extensions).and_return([
+      csr.stubs(:request_extensions).returns([
         {'oid' => '1.3.6.1.4.1.34380.1.2.1', 'value' => 'some-value'},
         {'oid' => 'pp_uuid', 'value' => 'some-uuid'},
       ])

data/spec/unit/configurer/downloader_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/configurer/downloader'
@@ -89,21 +90,21 @@ describe Puppet::Configurer::Downloader do
       end
 
       it "should always set the owner to the current UID" do
-        expect(Process).to receive(:uid).and_return(51)
+        Process.expects(:uid).returns 51
 
         file = generate_file_resource(:path => '/path')
         expect(file[:owner]).to eq(51)
       end
 
       it "should always set the group to the current GID" do
-        expect(Process).to receive(:gid).and_return(61)
+        Process.expects(:gid).returns 61
 
         file = generate_file_resource(:path => '/path')
         expect(file[:group]).to eq(61)
       end
     end
 
-    describe "on Windows", :if => Puppet.features.microsoft_windows? do
+    describe "on Windows", :if => Puppet::Util::Platform.windows? do
       it "should omit the owner" do
         file = generate_file_resource(:path => 'C:/path')
 
@@ -160,7 +161,7 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should not issue a deprecation warning for source_permissions" do
-      expect(Puppet).not_to receive(:puppet_deprecation_warning)
+      Puppet.expects(:puppet_deprecation_warning).never
       catalog = @dler.catalog
       expect(catalog.resources.size).to eq(1) # Must consume catalog to fix warnings
     end
@@ -183,37 +184,37 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should log that it is downloading" do
-      expect(Puppet).to receive(:info)
+      Puppet.expects(:info)
 
       @dler.evaluate
     end
 
     it "should return all changed file paths" do
-      trans = double('transaction')
+      trans = mock 'transaction'
 
-      catalog = double('catalog')
-      expect(@dler).to receive(:catalog).and_return(catalog)
-      expect(catalog).to receive(:apply).and_yield(trans)
+      catalog = mock 'catalog'
+      @dler.expects(:catalog).returns(catalog)
+      catalog.expects(:apply).yields(trans)
 
-      resource = double('resource')
-      expect(resource).to receive(:[]).with(:path).and_return("/changed/file")
+      resource = mock 'resource'
+      resource.expects(:[]).with(:path).returns "/changed/file"
 
-      expect(trans).to receive(:changed?).and_return([resource])
+      trans.expects(:changed?).returns([resource])
 
       expect(@dler.evaluate).to eq(%w{/changed/file})
     end
 
     it "should yield the resources if a block is given" do
-      trans = double('transaction')
+      trans = mock 'transaction'
 
-      catalog = double('catalog')
-      expect(@dler).to receive(:catalog).and_return(catalog)
-      expect(catalog).to receive(:apply).and_yield(trans)
+      catalog = mock 'catalog'
+      @dler.expects(:catalog).returns(catalog)
+      catalog.expects(:apply).yields(trans)
 
-      resource = double('resource')
-      expect(resource).to receive(:[]).with(:path).and_return("/changed/file")
+      resource = mock 'resource'
+      resource.expects(:[]).with(:path).returns "/changed/file"
 
-      expect(trans).to receive(:changed?).and_return([resource])
+      trans.expects(:changed?).returns([resource])
 
       yielded = nil
       @dler.evaluate { |r| yielded = r }
@@ -221,22 +222,12 @@ describe Puppet::Configurer::Downloader do
     end
 
     it "should catch and log exceptions" do
-      expect(Puppet).to receive(:err)
+      Puppet.expects(:err)
       # The downloader creates a new catalog for each apply, and really the only object
       # that it is possible to stub for the purpose of generating a puppet error
-      allow_any_instance_of(Puppet::Resource::Catalog).to receive(:apply).and_raise(Puppet::Error, "testing")
+      Puppet::Resource::Catalog.any_instance.stubs(:apply).raises(Puppet::Error, "testing")
 
       expect { @dler.evaluate }.not_to raise_error
     end
-
-    it "raises an exception if catalog application fails" do
-      Puppet[:ignore_plugin_errors] = false
-
-      expect(@dler.file).to receive(:retrieve).and_raise(Puppet::Error, "testing")
-
-      expect {
-        @dler.evaluate
-      }.to raise_error(Puppet::Error, /testing/)
-    end
   end
 end

data/spec/unit/configurer/fact_handler_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/configurer'
 require 'puppet/configurer/fact_handler'
@@ -22,6 +23,10 @@ describe Puppet::Configurer::FactHandler do
 
   let(:facthandler) { FactHandlerTester.new('production') }
 
+  before :each do
+    Puppet::Node::Facts.indirection.terminus_class = :memory
+  end
+
   describe "when finding facts" do
     it "should use the node name value to retrieve the facts" do
       foo_facts = Puppet::Node::Facts.new('foo')
@@ -53,13 +58,13 @@ describe Puppet::Configurer::FactHandler do
     end
 
     it "should fail if finding facts fails" do
-      expect(Puppet::Node::Facts.indirection).to receive(:find).and_raise(RuntimeError)
+      Puppet::Node::Facts.indirection.expects(:find).raises RuntimeError
 
       expect { facthandler.find_facts }.to raise_error(Puppet::Error, /Could not retrieve local facts/)
     end
 
     it "should only load fact plugins once" do
-      expect(Puppet::Node::Facts.indirection).to receive(:find).once
+      Puppet::Node::Facts.indirection.expects(:find).once
       facthandler.find_facts
     end
   end

data/spec/unit/configurer/plugin_handler_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/configurer'
 require 'puppet/configurer/plugin_handler'
@@ -10,35 +11,21 @@ describe Puppet::Configurer::PluginHandler do
     before :each do
       # PluginHandler#load_plugin has an extra-strong rescue clause
       # this mock is to make sure that we don't silently ignore errors
-      expect(Puppet).not_to receive(:err)
+      Puppet.expects(:err).never
       # Server_agent version needs to be at 5.3.4 in order to mount locales
       Puppet.push_context({:server_agent_version => "5.3.4"})
     end
 
     it "downloads plugins, facts, and locales" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) { times_called += 1 }.and_return([])
+      Puppet::Configurer::Downloader.any_instance.expects(:evaluate).times(3).returns([])
 
       pluginhandler.download_plugins(environment)
-      expect(times_called).to eq(3)
     end
 
     it "returns downloaded plugin, fact, and locale filenames" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        times_called += 1
-
-        if times_called == 1
-          %w[/a]
-        elsif times_called == 2
-          %w[/b]
-        else
-          %w[/c]
-        end
-      end
+      Puppet::Configurer::Downloader.any_instance.expects(:evaluate).times(3).returns(%w[/a]).then.returns(%w[/b]).then.returns(%w[/c])
 
       expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b /c])
-      expect(times_called).to eq(3)
     end
   end
 
@@ -46,25 +33,15 @@ describe Puppet::Configurer::PluginHandler do
     before :each do
       # PluginHandler#load_plugin has an extra-strong rescue clause
       # this mock is to make sure that we don't silently ignore errors
-      expect(Puppet).not_to receive(:err)
+      Puppet.expects(:err).never
       # Server_agent version needs to be at 5.3.4 in order to mount locales
       Puppet.push_context({:server_agent_version => "5.3.3"})
     end
 
     it "returns downloaded plugin, fact, but not locale filenames" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        times_called += 1
-
-        if times_called == 1
-          %w[/a]
-        else
-          %w[/b]
-        end
-      end
+      Puppet::Configurer::Downloader.any_instance.expects(:evaluate).times(2).returns(%w[/a]).then.returns(%w[/b])
 
       expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
-      expect(times_called).to eq(2)
     end
   end
 
@@ -72,26 +49,16 @@ describe Puppet::Configurer::PluginHandler do
     before :each do
       # PluginHandler#load_plugin has an extra-strong rescue clause
       # this mock is to make sure that we don't silently ignore errors
-      expect(Puppet).not_to receive(:err)
+      Puppet.expects(:err).never
       # Server_agent version needs to be at 5.3.4 in order to mount locales
       # A blank version will default to 0.0
       Puppet.push_context({:server_agent_version => ""})
     end
 
     it "returns downloaded plugin, fact, but not locale filenames" do
-      times_called = 0
-      allow_any_instance_of(Puppet::Configurer::Downloader).to receive(:evaluate) do
-        times_called += 1
-
-        if times_called == 1
-          %w[/a]
-        else
-          %w[/b]
-        end
-      end
+      Puppet::Configurer::Downloader.any_instance.expects(:evaluate).times(2).returns(%w[/a]).then.returns(%w[/b])
 
       expect(pluginhandler.download_plugins(environment)).to match_array(%w[/a /b])
-      expect(times_called).to eq(2)
     end
   end
 end

data/spec/unit/configurer_spec.rb

@@ -1,325 +1,367 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/configurer'
-require 'webmock/rspec'
 
 describe Puppet::Configurer do
   before do
+    Puppet.settings.stubs(:use).returns(true)
+    @agent = Puppet::Configurer.new
+    @agent.stubs(:init_storage)
+    Puppet::Util::Storage.stubs(:store)
     Puppet[:server] = "puppetmaster"
     Puppet[:report] = true
-
-    catalog.add_resource(resource)
-
-    allow(Puppet::SSL::Host).to receive(:localhost).and_return(double('host'))
   end
 
-  let(:configurer) { Puppet::Configurer.new }
-  let(:report) { Puppet::Transaction::Report.new }
-  let(:catalog) { Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym)) }
-  let(:resource) { Puppet::Resource.new(:notice, 'a') }
-  let(:facts) { Puppet::Node::Facts.new(Puppet[:node_name_value]) }
+  it "should include the Fact Handler module" do
+    expect(Puppet::Configurer.ancestors).to be_include(Puppet::Configurer::FactHandler)
+  end
 
   describe "when executing a pre-run hook" do
     it "should do nothing if the hook is set to an empty string" do
       Puppet.settings[:prerun_command] = ""
-      expect(Puppet::Util::Execution).not_to receive(:execute)
+      Puppet::Util.expects(:exec).never
 
-      configurer.execute_prerun_command
+      @agent.execute_prerun_command
     end
 
     it "should execute any pre-run command provided via the 'prerun_command' setting" do
       Puppet.settings[:prerun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      configurer.execute_prerun_command
+      @agent.execute_prerun_command
     end
 
     it "should fail if the command fails" do
       Puppet.settings[:prerun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      expect(configurer.execute_prerun_command).to be_falsey
+      expect(@agent.execute_prerun_command).to be_falsey
     end
   end
 
   describe "when executing a post-run hook" do
     it "should do nothing if the hook is set to an empty string" do
       Puppet.settings[:postrun_command] = ""
-      expect(Puppet::Util::Execution).not_to receive(:execute)
+      Puppet::Util.expects(:exec).never
 
-      configurer.execute_postrun_command
+      @agent.execute_postrun_command
     end
 
     it "should execute any post-run command provided via the 'postrun_command' setting" do
       Puppet.settings[:postrun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      configurer.execute_postrun_command
+      @agent.execute_postrun_command
     end
 
     it "should fail if the command fails" do
       Puppet.settings[:postrun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      expect(configurer.execute_postrun_command).to be_falsey
+      expect(@agent.execute_postrun_command).to be_falsey
     end
   end
 
   describe "when executing a catalog run" do
     before do
+      Puppet.settings.stubs(:use).returns(true)
+      @agent.stubs(:download_plugins)
+      Puppet::Node::Facts.indirection.terminus_class = :memory
+      @facts = Puppet::Node::Facts.new(Puppet[:node_name_value])
+      Puppet::Node::Facts.indirection.save(@facts)
+
+      @catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
+      @catalog.stubs(:to_ral).returns(@catalog)
       Puppet::Resource::Catalog.indirection.terminus_class = :rest
-      allow(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(catalog)
+      Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
+      @agent.stubs(:send_report)
+      @agent.stubs(:save_last_run_summary)
+
+      Puppet::Util::Log.stubs(:close_all)
+    end
+
+    after :all do
+      Puppet::Node::Facts.indirection.reset_terminus_class
+      Puppet::Resource::Catalog.indirection.reset_terminus_class
+    end
+
+    it "should initialize storage" do
+      Puppet::Util::Storage.expects(:load)
+      @agent.run
     end
 
     it "downloads plugins when told" do
-      expect(configurer).to receive(:download_plugins)
-      configurer.run(:pluginsync => true)
+      @agent.expects(:download_plugins)
+      @agent.run(:pluginsync => true)
     end
 
     it "does not download plugins when told" do
-      expect(configurer).not_to receive(:download_plugins)
-      configurer.run(:pluginsync => false)
+      @agent.expects(:download_plugins).never
+      @agent.run(:pluginsync => false)
     end
 
     it "should carry on when it can't fetch its node definition" do
       error = Net::HTTPError.new(400, 'dummy server communication error')
-      expect(Puppet::Node.indirection).to receive(:find).and_raise(error)
-      expect(configurer.run).to eq(0)
+      Puppet::Node.indirection.expects(:find).raises(error)
+      expect(@agent.run).to eq(0)
     end
 
-    it "fails the run if pluginsync fails when usecacheonfailure is false" do
-      Puppet[:ignore_plugin_errors] = false
-
-      # --test implies these, set them so we don't fall back to a cached catalog
-      Puppet[:use_cached_catalog] = false
-      Puppet[:usecacheonfailure] = false
-
-      body = "{\"message\":\"Not Found: Could not find environment 'fasdfad'\",\"issue_kind\":\"RUNTIME_ERROR\"}"
-      stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(
-        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
-      )
-      stub_request(:get, %r{/puppet/v3/file_metadata/pluginfacts}).to_return(
-        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
-      )
+    it "applies a cached catalog when it can't connect to the master" do
+      error = Errno::ECONNREFUSED.new('Connection refused - connect(2)')
 
-      configurer.run(pluginsync: true)
+      Puppet::Node.indirection.expects(:find).raises(error)
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entry(:ignore_cache => true)).raises(error)
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entry(:ignore_terminus => true)).returns(@catalog)
 
-      expect(@logs).to include(an_object_having_attributes(level: :err, message: %r{Failed to apply catalog: Failed to retrieve pluginfacts: Could not retrieve information from environment production source\(s\) puppet:///pluginfacts}))
+      expect(@agent.run).to eq(0)
     end
 
-    it "applies a cached catalog if pluginsync fails when usecacheonfailure is true" do
-      Puppet[:ignore_plugin_errors] = false
-
-      Puppet[:use_cached_catalog] = false
-      Puppet[:usecacheonfailure] = true
-
-      body = "{\"message\":\"Not Found: Could not find environment 'fasdfad'\",\"issue_kind\":\"RUNTIME_ERROR\"}"
-      stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(
-        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
-      )
-      stub_request(:get, %r{/puppet/v3/file_metadata/pluginfacts}).to_return(
-        status: 404, body: body, headers: {'Content-Type' => 'application/json'}
-      )
+    it "should initialize a transaction report if one is not provided" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns report
 
-      expect(configurer.run(pluginsync: true, :report => report)).to eq(0)
-      expect(report.cached_catalog_status).to eq('on_failure')
+      @agent.run
     end
 
-    it "applies a cached catalog when it can't connect to the master" do
-      error = Errno::ECONNREFUSED.new('Connection refused - connect(2)')
+    it "should respect node_name_fact when setting the host on a report" do
+      Puppet[:node_name_fact] = 'my_name_fact'
+      @facts.values = {'my_name_fact' => 'node_name_from_fact'}
 
-      expect(Puppet::Node.indirection).to receive(:find).and_raise(error)
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(:ignore_cache => true)).and_raise(error)
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(:ignore_terminus => true)).and_return(catalog)
+      report = Puppet::Transaction::Report.new
 
-      expect(configurer.run).to eq(0)
+      @agent.run(:report => report)
+      expect(report.host).to eq('node_name_from_fact')
     end
 
-    it "should initialize a transaction report if one is not provided" do
-      # host and settings catalogs each create a report...
-      expect(Puppet::Transaction::Report).to receive(:new).and_return(report).twice
+    it "should pass the new report to the catalog" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.stubs(:new).returns report
+      @catalog.expects(:apply).with{|options| options[:report] == report}
 
-      configurer.run
+      @agent.run
     end
 
-    it "should respect node_name_fact when setting the host on a report" do
-      Puppet[:node_name_fact] = 'my_name_fact'
-      facts.values = {'my_name_fact' => 'node_name_from_fact'}
-      Puppet::Node::Facts.indirection.save(facts)
+    it "should use the provided report if it was passed one" do
+      report = Puppet::Transaction::Report.new
+      @catalog.expects(:apply).with {|options| options[:report] == report}
 
-      configurer.run(:report => report)
-      expect(report.host).to eq('node_name_from_fact')
+      @agent.run(:report => report)
     end
 
-    it "creates a new report when applying the catalog" do
-      options = {}
-      configurer.run(options)
+    it "should set the report as a log destination" do
+      report = Puppet::Transaction::Report.new
+
+      report.expects(:<<).with(instance_of(Puppet::Util::Log)).at_least_once
 
-      expect(options[:report].metrics['time']['catalog_application']).to be_an_instance_of(Float)
+      @agent.run(:report => report)
     end
 
-    it "uses the provided report when applying the catalog" do
-      configurer.run(:report => report)
+    it "should retrieve the catalog" do
+      @agent.expects(:retrieve_catalog)
 
-      expect(report.metrics['time']['catalog_application']).to be_an_instance_of(Float)
+      @agent.run
     end
 
     it "should log a failure and do nothing if no catalog can be retrieved" do
-      expect(configurer).to receive(:retrieve_catalog).and_return(nil)
+      @agent.expects(:retrieve_catalog).returns nil
+
+      Puppet.expects(:err).with "Could not retrieve catalog; skipping run"
+
+      @agent.run
+    end
 
-      expect(Puppet).to receive(:err).with("Could not retrieve catalog; skipping run")
+    it "should apply the catalog with all options to :run" do
+      @agent.expects(:retrieve_catalog).returns @catalog
 
-      configurer.run
+      @catalog.expects(:apply).with { |args| args[:one] == true }
+      @agent.run :one => true
     end
 
-    it "passes arbitrary options when applying the catalog" do
-      expect(catalog).to receive(:apply).with(hash_including(one: true))
+    it "should accept a catalog and use it instead of retrieving a different one" do
+      @agent.expects(:retrieve_catalog).never
 
-      configurer.run(catalog: catalog, one: true)
+      @catalog.expects(:apply)
+      @agent.run :one => true, :catalog => @catalog
     end
 
     it "should benchmark how long it takes to apply the catalog" do
-      configurer.run(report: report)
+      @agent.expects(:benchmark).with(:notice, instance_of(String))
 
-      expect(report.logs).to include(an_object_having_attributes(level: :notice, message: /Applied catalog in .* seconds/))
+      @agent.expects(:retrieve_catalog).returns @catalog
+
+      @catalog.expects(:apply).never # because we're not yielding
+      @agent.run
+    end
+
+    it "should execute post-run hooks after the run" do
+      @agent.expects(:execute_postrun_command)
+
+      @agent.run
     end
 
     it "should create report with passed transaction_uuid and job_id" do
-      configurer = Puppet::Configurer.new("test_tuuid", "test_jid")
+      @agent = Puppet::Configurer.new("test_tuuid", "test_jid")
+      @agent.stubs(:init_storage)
 
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      expect(Puppet::Transaction::Report).to receive(:new).with(anything, anything, 'test_tuuid', 'test_jid').and_return(report)
-      expect(configurer).to receive(:send_report).with(report)
+      Puppet::Transaction::Report.expects(:new).with(anything, anything, 'test_tuuid', 'test_jid').returns(report)
+      @agent.expects(:send_report).with(report)
 
-      configurer.run
+      @agent.run
     end
 
     it "should send the report" do
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
-      expect(configurer).to receive(:send_report).with(report)
+      Puppet::Transaction::Report.expects(:new).returns(report)
+      @agent.expects(:send_report).with(report)
 
       expect(report.environment).to eq("test")
       expect(report.transaction_uuid).to eq("aaaa")
 
-      configurer.run
+      @agent.run
     end
 
     it "should send the transaction report even if the catalog could not be retrieved" do
-      expect(configurer).to receive(:retrieve_catalog).and_return(nil)
+      @agent.expects(:retrieve_catalog).returns nil
 
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
-      expect(configurer).to receive(:send_report).with(report)
+      Puppet::Transaction::Report.expects(:new).returns(report)
+      @agent.expects(:send_report).with(report)
 
       expect(report.environment).to eq("test")
       expect(report.transaction_uuid).to eq("aaaa")
 
-      configurer.run
+      @agent.run
     end
 
     it "should send the transaction report even if there is a failure" do
-      expect(configurer).to receive(:retrieve_catalog).and_raise("whatever")
+      @agent.expects(:retrieve_catalog).raises "whatever"
 
       report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
-      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
-      expect(configurer).to receive(:send_report).with(report)
+      Puppet::Transaction::Report.expects(:new).returns(report)
+      @agent.expects(:send_report).with(report)
 
       expect(report.environment).to eq("test")
       expect(report.transaction_uuid).to eq("aaaa")
 
-      expect(configurer.run).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it "should remove the report as a log destination when the run is finished" do
-      configurer.run(report: report)
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      @agent.run
 
       expect(Puppet::Util::Log.destinations).not_to include(report)
     end
 
-    it "should return an exit status of 2 due to the notify resource 'changing'" do
-      cat = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
-      cat.add_resource(Puppet::Type.type(:notify).new(:name => 'something changed'))
+    it "should return the report exit_status as the result of the run" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+      report.expects(:exit_status).returns(1234)
 
-      expect(configurer.run(catalog: cat, report: report)).to eq(2)
+      expect(@agent.run).to eq(1234)
     end
 
     it "should return nil if catalog application fails" do
-      expect(catalog).to receive(:apply).and_raise(Puppet::Error, 'One or more resource dependency cycles detected in graph')
-
-      expect(configurer.run(catalog: catalog, report: report)).to be_nil
+      @catalog.expects(:apply).raises(Puppet::Error, 'One or more resource dependency cycles detected in graph')
+      report = Puppet::Transaction::Report.new
+      expect(@agent.run(catalog: @catalog, report: report)).to be_nil
     end
 
     it "should send the transaction report even if the pre-run command fails" do
-      expect(Puppet::Transaction::Report).to receive(:new).and_return(report)
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
 
       Puppet.settings[:prerun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
-      expect(configurer).to receive(:send_report).with(report)
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      @agent.expects(:send_report).with(report)
 
-      expect(configurer.run).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it "should include the pre-run command failure in the report" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
       Puppet.settings[:prerun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      expect(configurer.run(report: report)).to be_nil
+      expect(@agent.run).to be_nil
       expect(report.logs.find { |x| x.message =~ /Could not run command from prerun_command/ }).to be
     end
 
     it "should send the transaction report even if the post-run command fails" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
       Puppet.settings[:postrun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
-      expect(configurer).to receive(:send_report).with(report)
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
+      @agent.expects(:send_report).with(report)
 
-      expect(configurer.run(report: report)).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it "should include the post-run command failure in the report" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
       Puppet.settings[:postrun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      expect(report).to receive(:<<) { |log, _| expect(log.message).to match(/Could not run command from postrun_command/) }.at_least(:once)
+      report.expects(:<<).with { |log| log.message.include?("Could not run command from postrun_command") }
 
-      expect(configurer.run(report: report)).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it "should execute post-run command even if the pre-run command fails" do
       Puppet.settings[:prerun_command] = "/my/precommand"
       Puppet.settings[:postrun_command] = "/my/postcommand"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/precommand"]).and_raise(Puppet::ExecutionFailure, "Failed")
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/postcommand"])
+      Puppet::Util::Execution.expects(:execute).with(["/my/precommand"]).raises(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/postcommand"])
 
-      expect(configurer.run).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it "should finalize the report" do
-      expect(report).to receive(:finalize_report)
-      configurer.run(report: report)
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
+      report.expects(:finalize_report)
+      @agent.run
     end
 
     it "should not apply the catalog if the pre-run command fails" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
       Puppet.settings[:prerun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      expect_any_instance_of(Puppet::Resource::Catalog).not_to receive(:apply)
-      expect(configurer).to receive(:send_report)
+      @catalog.expects(:apply).never()
+      @agent.expects(:send_report)
 
-      expect(configurer.run(report: report)).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it "should apply the catalog, send the report, and return nil if the post-run command fails" do
+      report = Puppet::Transaction::Report.new
+      Puppet::Transaction::Report.expects(:new).returns(report)
+
       Puppet.settings[:postrun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      expect_any_instance_of(Puppet::Resource::Catalog).to receive(:apply)
-      expect(configurer).to receive(:send_report)
+      @catalog.expects(:apply)
+      @agent.expects(:send_report)
 
-      expect(configurer.run(report: report)).to be_nil
+      expect(@agent.run).to be_nil
     end
 
     it 'includes total time metrics in the report after successfully applying the catalog' do
-      configurer.run(report: report)
+      report = Puppet::Transaction::Report.new
+      @catalog.stubs(:apply).with() {|options| options[:report] == report }
+      @agent.run(report: report)
 
       expect(report.metrics['time']).to be
       expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
@@ -327,17 +369,19 @@ describe Puppet::Configurer do
 
     it 'includes total time metrics in the report even if prerun fails' do
       Puppet.settings[:prerun_command] = "/my/command"
-      expect(Puppet::Util::Execution).to receive(:execute).with(["/my/command"]).and_raise(Puppet::ExecutionFailure, "Failed")
+      Puppet::Util::Execution.expects(:execute).with(["/my/command"]).raises(Puppet::ExecutionFailure, "Failed")
 
-      configurer.run(report: report)
+      report = Puppet::Transaction::Report.new
+      @agent.run(report: report)
 
       expect(report.metrics['time']).to be
       expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
     end
 
     it 'includes total time metrics in the report even if catalog retrieval fails' do
-      allow(configurer).to receive(:prepare_and_retrieve_catalog_from_cache).and_raise
-      configurer.run(:report => report)
+      report = Puppet::Transaction::Report.new
+      @agent.stubs(:prepare_and_retrieve_catalog_from_cache).raises
+      @agent.run(:report => report)
 
       expect(report.metrics['time']).to be
       expect(report.metrics['time']['total']).to be_a_kind_of(Numeric)
@@ -345,155 +389,170 @@ describe Puppet::Configurer do
 
     it "should refetch the catalog if the server specifies a new environment in the catalog" do
       catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
-      expect(configurer).to receive(:retrieve_catalog).and_return(catalog).twice
+      @agent.expects(:retrieve_catalog).returns(catalog).twice
 
-      configurer.run
+      @agent.run
     end
 
-    it "changes the configurer's environment if the server specifies a new environment in the catalog" do
-      allow_any_instance_of(Puppet::Resource::Catalog).to receive(:environment).and_return("second_env")
+    it "should change the environment setting if the server specifies a new environment in the catalog" do
+      @catalog.stubs(:environment).returns("second_env")
 
-      configurer.run
+      @agent.run
 
-      expect(configurer.environment).to eq("second_env")
+      expect(@agent.environment).to eq("second_env")
     end
 
-    it "changes the report's environment if the server specifies a new environment in the catalog" do
-      allow_any_instance_of(Puppet::Resource::Catalog).to receive(:environment).and_return("second_env")
+    it "should fix the report if the server specifies a new environment in the catalog" do
+      report = Puppet::Transaction::Report.new(nil, "test", "aaaa")
+      Puppet::Transaction::Report.expects(:new).returns(report)
+      @agent.expects(:send_report).with(report)
 
-      configurer.run(report: report)
+      @catalog.stubs(:environment).returns("second_env")
+      @agent.stubs(:retrieve_catalog).returns(@catalog)
+
+      @agent.run
 
       expect(report.environment).to eq("second_env")
     end
 
     it "sends the transaction uuid in a catalog request" do
-      configurer = Puppet::Configurer.new('aaa')
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(transaction_uuid: 'aaa'))
-      configurer.run
+      @agent.instance_variable_set(:@transaction_uuid, 'aaa')
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:transaction_uuid => 'aaa'))
+      @agent.run
     end
 
     it "sends the transaction uuid in a catalog request" do
-      configurer = Puppet::Configurer.new('b', 'aaa')
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(job_id: 'aaa'))
-      configurer.run
+      @agent.instance_variable_set(:@job_id, 'aaa')
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:job_id => 'aaa'))
+      @agent.run
     end
 
     it "sets the static_catalog query param to true in a catalog request" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(static_catalog: true))
-      configurer.run
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:static_catalog => true))
+      @agent.run
     end
 
     it "sets the checksum_type query param to the default supported_checksum_types in a catalog request" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything,
-        hash_including(checksum_type: 'md5.sha256.sha384.sha512.sha224'))
-      configurer.run
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything,
+        has_entries(:checksum_type => 'md5.sha256.sha384.sha512.sha224'))
+      @agent.run
     end
 
     it "sets the checksum_type query param to the supported_checksum_types setting in a catalog request" do
-      Puppet[:supported_checksum_types] = ['sha256']
       # Regenerate the agent to pick up the new setting
-      configurer = Puppet::Configurer.new
+      Puppet[:supported_checksum_types] = ['sha256']
+      @agent = Puppet::Configurer.new
+      @agent.stubs(:init_storage)
+      @agent.stubs(:download_plugins)
+      @agent.stubs(:send_report)
+      @agent.stubs(:save_last_run_summary)
 
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(checksum_type: 'sha256'))
-      configurer.run
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:checksum_type => 'sha256'))
+      @agent.run
     end
 
     describe "when not using a REST terminus for catalogs" do
       it "should not pass any facts when retrieving the catalog" do
-        # This is weird, we collect facts when constructing the node,
-        # but we don't send them in the indirector request. Then the compiler
-        # looks up the node, and collects its facts, which we could have sent
-        # in the first place. This seems like a bug.
         Puppet::Resource::Catalog.indirection.terminus_class = :compiler
+        @agent.expects(:facts_for_uploading).never
+        Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options|
+          options[:facts].nil?
+        }.returns @catalog
 
-        expect(Puppet::Resource::Catalog.indirection).to receive(:find) do |name, options|
-          expect(options[:facts]).to be_nil
-        end.and_return(catalog)
-
-        configurer.run
+        @agent.run
       end
     end
 
     describe "when using a REST terminus for catalogs" do
-      it "should pass the url encoded facts and facts format as arguments when retrieving the catalog" do
+      it "should pass the prepared facts and the facts format as arguments when retrieving the catalog" do
         Puppet::Resource::Catalog.indirection.terminus_class = :rest
-
-        facts.values = { 'foo' => 'bar' }
-        Puppet::Node::Facts.indirection.save(facts)
-
-        expect(
-          Puppet::Resource::Catalog.indirection
-        ).to receive(:find) do |_, options|
-          expect(options[:facts_format]).to eq("application/json")
-
-          unescaped = JSON.parse(CGI.unescape(options[:facts]))
-          expect(unescaped).to include("values" => {"foo" => "bar"})
-        end.and_return(catalog)
-
-        configurer.run
+        # the "facts_for_uploading" are prepeared by first finding facts, and then encoding them
+        # this mocks the "find" with a special value 12345, which is then expected back in the
+        # call to "encode" - the encode in turn returns mocked data that is asserted as being
+        # presented to the catalog terminus as options.
+        #
+        @agent.expects(:find_facts).returns(12345)
+        @agent.expects(:encode_facts).with(12345).returns(:facts => "myfacts", :facts_format => :foo)
+        Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options|
+          options[:facts] == "myfacts" and options[:facts_format] == :foo
+        }.returns @catalog
+
+        @agent.run
       end
     end
   end
 
+  describe "when initialized with a transaction_uuid" do
+    it "stores it" do
+      SecureRandom.expects(:uuid).never
+      configurer = Puppet::Configurer.new('foo')
+      expect(configurer.instance_variable_get(:@transaction_uuid) == 'foo')
+    end
+  end
+
   describe "when sending a report" do
     include PuppetSpec::Files
 
     before do
+      Puppet.settings.stubs(:use).returns(true)
+      @configurer = Puppet::Configurer.new
       Puppet[:lastrunfile] = tmpfile('last_run_file')
+
+      @report = Puppet::Transaction::Report.new
       Puppet[:reports] = "none"
     end
 
     it "should print a report summary if configured to do so" do
       Puppet.settings[:summarize] = true
 
-      expect(report).to receive(:summary).and_return("stuff")
+      @report.expects(:summary).returns "stuff"
 
-      expect(configurer).to receive(:puts).with("stuff")
-      configurer.send_report(report)
+      @configurer.expects(:puts).with("stuff")
+      @configurer.send_report(@report)
     end
 
     it "should not print a report summary if not configured to do so" do
       Puppet.settings[:summarize] = false
 
-      expect(configurer).not_to receive(:puts)
-      configurer.send_report(report)
+      @configurer.expects(:puts).never
+      @configurer.send_report(@report)
     end
 
     it "should save the report if reporting is enabled" do
       Puppet.settings[:report] = true
 
-      expect(Puppet::Transaction::Report.indirection).to receive(:save).with(report, nil, instance_of(Hash))
-      configurer.send_report(report)
+      Puppet::Transaction::Report.indirection.expects(:save).with(@report, nil, instance_of(Hash))
+      @configurer.send_report(@report)
     end
 
     it "should not save the report if reporting is disabled" do
       Puppet.settings[:report] = false
 
-      expect(Puppet::Transaction::Report.indirection).not_to receive(:save).with(report, nil, instance_of(Hash))
-      configurer.send_report(report)
+      Puppet::Transaction::Report.indirection.expects(:save).with(@report, nil, instance_of(Hash)).never
+      @configurer.send_report(@report)
     end
 
     it "should save the last run summary if reporting is enabled" do
       Puppet.settings[:report] = true
 
-      expect(configurer).to receive(:save_last_run_summary).with(report)
-      configurer.send_report(report)
+      @configurer.expects(:save_last_run_summary).with(@report)
+      @configurer.send_report(@report)
     end
 
     it "should save the last run summary if reporting is disabled" do
       Puppet.settings[:report] = false
 
-      expect(configurer).to receive(:save_last_run_summary).with(report)
-      configurer.send_report(report)
+      @configurer.expects(:save_last_run_summary).with(@report)
+      @configurer.send_report(@report)
     end
 
     it "should log but not fail if saving the report fails" do
       Puppet.settings[:report] = true
 
-      expect(Puppet::Transaction::Report.indirection).to receive(:save).and_raise("whatever")
+      Puppet::Transaction::Report.indirection.expects(:save).raises("whatever")
 
-      expect(Puppet).to receive(:err)
-      expect { configurer.send_report(report) }.not_to raise_error
+      Puppet.expects(:err)
+      expect { @configurer.send_report(@report) }.not_to raise_error
     end
   end
 
@@ -501,17 +560,22 @@ describe Puppet::Configurer do
     include PuppetSpec::Files
 
     before do
+      Puppet.settings.stubs(:use).returns(true)
+      @configurer = Puppet::Configurer.new
+
+      @report = stub 'report', :raw_summary => {}
+
       Puppet[:lastrunfile] = tmpfile('last_run_file')
     end
 
     it "should write the last run file" do
-      configurer.save_last_run_summary(report)
+      @configurer.save_last_run_summary(@report)
       expect(Puppet::FileSystem.exist?(Puppet[:lastrunfile])).to be_truthy
     end
 
     it "should write the raw summary as yaml" do
-      expect(report).to receive(:raw_summary).and_return("summary")
-      configurer.save_last_run_summary(report)
+      @report.expects(:raw_summary).returns("summary")
+      @configurer.save_last_run_summary(@report)
       expect(File.read(Puppet[:lastrunfile])).to eq(YAML.dump("summary"))
     end
 
@@ -524,15 +588,15 @@ describe Puppet::Configurer do
         end
       end.new
 
-      expect(Puppet::Util).to receive(:replace_file).and_yield(fh)
+      Puppet::Util.expects(:replace_file).yields(fh)
 
-      expect(Puppet).to receive(:err)
-      expect { configurer.save_last_run_summary(report) }.to_not raise_error
+      Puppet.expects(:err)
+      expect { @configurer.save_last_run_summary(@report) }.to_not raise_error
     end
 
     it "should create the last run file with the correct mode" do
-      expect(Puppet.settings.setting(:lastrunfile)).to receive(:mode).and_return('664')
-      configurer.save_last_run_summary(report)
+      Puppet.settings.setting(:lastrunfile).expects(:mode).returns('664')
+      @configurer.save_last_run_summary(@report)
 
       if Puppet::Util::Platform.windows?
         require 'puppet/util/windows/security'
@@ -544,68 +608,66 @@ describe Puppet::Configurer do
     end
 
     it "should report invalid last run file permissions" do
-      expect(Puppet.settings.setting(:lastrunfile)).to receive(:mode).and_return('892')
-      expect(Puppet).to receive(:err).with(/Could not save last run local report.*892 is invalid/)
-      configurer.save_last_run_summary(report)
+      Puppet.settings.setting(:lastrunfile).expects(:mode).returns('892')
+      Puppet.expects(:err).with(regexp_matches(/Could not save last run local report.*892 is invalid/))
+      @configurer.save_last_run_summary(@report)
     end
   end
 
   describe "when requesting a node" do
     it "uses the transaction uuid in the request" do
-      expect(Puppet::Node.indirection).to receive(:find).with(anything, hash_including(transaction_uuid: anything)).twice
-      configurer.run
+      Puppet::Node.indirection.expects(:find).with(anything, has_entries(:transaction_uuid => anything)).twice
+      @agent.run
     end
 
     it "sends an explicitly configured environment request" do
-      expect(Puppet.settings).to receive(:set_by_config?).with(:environment).and_return(true)
-      expect(Puppet::Node.indirection).to receive(:find).with(anything, hash_including(configured_environment: Puppet[:environment])).twice
-      configurer.run
+      Puppet.settings.expects(:set_by_config?).with(:environment).returns(true)
+      Puppet::Node.indirection.expects(:find).with(anything, has_entries(:configured_environment => Puppet[:environment])).twice
+      @agent.run
     end
 
     it "does not send a configured_environment when using the default" do
-      expect(Puppet::Node.indirection).to receive(:find).with(anything, hash_including(configured_environment: nil)).twice
-      configurer.run
+      Puppet::Node.indirection.expects(:find).with(anything, has_entries(:configured_environment => nil)).twice
+      @agent.run
     end
   end
 
-  def expects_pluginsync
-    metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":0,\"group\":0,\"mode\":420,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
-    stub_request(:get, %r{/puppet/v3/file_metadatas/(plugins|locales)}).to_return(status: 200, body: metadata, headers: {'Content-Type' => 'application/json'})
-
-    # response retains owner/group/mode due to source_permissions => use
-    facts_metadata = "[{\"path\":\"/etc/puppetlabs/code\",\"relative_path\":\".\",\"links\":\"follow\",\"owner\":500,\"group\":500,\"mode\":493,\"checksum\":{\"type\":\"ctime\",\"value\":\"{ctime}2020-07-10 14:00:00 -0700\"},\"type\":\"directory\",\"destination\":null}]"
-    stub_request(:get, %r{/puppet/v3/file_metadatas/pluginfacts}).to_return(status: 200, body: facts_metadata, headers: {'Content-Type' => 'application/json'})
-  end
-
   def expects_new_catalog_only(catalog)
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(catalog)
-    expect(Puppet::Resource::Catalog.indirection).not_to receive(:find).with(anything, hash_including(ignore_terminus: true))
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns catalog
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.never
   end
 
   def expects_cached_catalog_only(catalog)
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
-    expect(Puppet::Resource::Catalog.indirection).not_to receive(:find).with(anything, hash_including(ignore_cache: true))
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns catalog
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.never
   end
 
   def expects_fallback_to_cached_catalog(catalog)
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns catalog
   end
 
   def expects_fallback_to_new_catalog(catalog)
-    expects_pluginsync
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(nil)
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(catalog)
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns nil
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns catalog
   end
 
   def expects_neither_new_or_cached_catalog
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
-    expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(nil)
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
+    Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns nil
   end
 
   describe "when retrieving a catalog" do
     before do
-      allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class).and_return(:rest)
+      Puppet.settings.stubs(:use).returns(true)
+      @agent.stubs(:facts_for_uploading).returns({})
+      @agent.stubs(:download_plugins)
+
+      # retrieve a catalog in the current environment, so we don't try to converge unexpectedly
+      @catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
+
+      # this is the default when using a Configurer instance
+      Puppet::Resource::Catalog.indirection.stubs(:terminus_class).returns :rest
     end
 
     describe "and configured to only retrieve a catalog from the cache" do
@@ -614,127 +676,100 @@ describe Puppet::Configurer do
       end
 
       it "should first look in the cache for a catalog" do
-        expects_cached_catalog_only(catalog)
+        expects_cached_catalog_only(@catalog)
 
-        configurer.run
+        expect(@agent.retrieve_catalog({})).to eq(@catalog)
       end
 
       it "should not make a node request or pluginsync when a cached catalog is successfully retrieved" do
-        expect(Puppet::Node.indirection).not_to receive(:find)
-        expects_cached_catalog_only(catalog)
-        expect(configurer).not_to receive(:download_plugins)
+        Puppet::Node.indirection.expects(:find).never
+        expects_cached_catalog_only(@catalog)
+        @agent.expects(:download_plugins).never
 
-        configurer.run
+        @agent.run
       end
 
       it "should make a node request and pluginsync when a cached catalog cannot be retrieved" do
-        expect(Puppet::Node.indirection).to receive(:find).and_return(nil)
-        expects_fallback_to_new_catalog(catalog)
+        Puppet::Node.indirection.expects(:find).returns nil
+        expects_fallback_to_new_catalog(@catalog)
+        @agent.expects(:download_plugins)
 
-        configurer.run
+        @agent.run
       end
 
       it "should set its cached_catalog_status to 'explicitly_requested'" do
-        expects_cached_catalog_only(catalog)
-
-        options = {}
-        configurer.run(options)
+        expects_cached_catalog_only(@catalog)
 
-        expect(options[:report].cached_catalog_status).to eq('explicitly_requested')
+        @agent.retrieve_catalog({})
+        expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('explicitly_requested')
       end
 
       it "should set its cached_catalog_status to 'explicitly requested' if the cached catalog is from a different environment" do
         cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
         expects_cached_catalog_only(cached_catalog)
 
-        options = {}
-        configurer.run(options)
-
-        expect(options[:report].cached_catalog_status).to eq('explicitly_requested')
+        @agent.retrieve_catalog({})
+        expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('explicitly_requested')
       end
 
       it "should compile a new catalog if none is found in the cache" do
-        expects_fallback_to_new_catalog(catalog)
+        expects_fallback_to_new_catalog(@catalog)
+
+        expect(@agent.retrieve_catalog({})).to eq(@catalog)
+      end
 
-        options = {}
-        configurer.run(options)
+      it "should set its cached_catalog_status to 'not_used' if no catalog is found in the cache" do
+        expects_fallback_to_new_catalog(@catalog)
 
-        expect(options[:report].cached_catalog_status).to eq('not_used')
+        @agent.retrieve_catalog({})
+        expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
       end
 
       it "should not attempt to retrieve a cached catalog again if the first attempt failed" do
-        expect(Puppet::Node.indirection).to receive(:find).and_return(nil)
+        Puppet::Node.indirection.expects(:find).returns(nil)
         expects_neither_new_or_cached_catalog
-        expects_pluginsync
 
-        configurer.run
+        @agent.run
       end
 
       it "should return the cached catalog when the environment doesn't match" do
         cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
         expects_cached_catalog_only(cached_catalog)
 
-        allow(Puppet).to receive(:info)
-        expect(Puppet).to receive(:info).with("Using cached catalog from environment 'second_env'")
-
-        configurer.run
-      end
-
-      it "applies the catalog passed as options when the catalog cache terminus is not set" do
-        expects_pluginsync
-
-        catalog.add_resource(Puppet::Resource.new('notify', 'from apply'))
-        configurer.run(catalog: catalog.to_ral)
-
-        # make sure cache class is not set to avoid surprises later
-        expect(Puppet::Resource::Catalog.indirection).to_not be_cache
-        expect(@logs).to include(an_object_having_attributes(level: :notice, message: /defined 'message' as 'from apply'/))
-      end
-
-      it "applies the cached catalog when the catalog cache terminus is set, ignoring the catalog passed as options" do
-        Puppet::Resource::Catalog.indirection.cache_class = :json
-
-        cached_catalog = Puppet::Resource::Catalog.new(Puppet[:node_name_value], Puppet[:environment])
-        cached_catalog.add_resource(Puppet::Resource.new('notify', 'from cache'))
-
-        # update cached catalog
-        Puppet.settings.use(:main, :agent)
-        path = Puppet::Resource::Catalog.indirection.cache.path(cached_catalog.name)
-        FileUtils.mkdir(File.dirname(path))
-        File.write(path, cached_catalog.render(:json))
-
-        configurer.run(catalog: catalog.to_ral)
-
-        expect(@logs).to include(an_object_having_attributes(level: :notice, message: /defined 'message' as 'from cache'/))
+        Puppet.expects(:info).with("Using cached catalog from environment 'second_env'")
+        expect(@agent.retrieve_catalog({})).to eq(cached_catalog)
       end
     end
 
     describe "and strict environment mode is set" do
       before do
+        @catalog.stubs(:to_ral).returns(@catalog)
+        @catalog.stubs(:write_class_file)
+        @catalog.stubs(:write_resource_file)
+        @agent.stubs(:send_report)
+        @agent.stubs(:save_last_run_summary)
         Puppet.settings[:strict_environment_mode] = true
       end
 
       it "should not make a node request" do
-        expect(Puppet::Node.indirection).not_to receive(:find)
+        Puppet::Node.indirection.expects(:find).never
 
-        configurer.run
+        @agent.run
       end
 
       it "should return nil when the catalog's environment doesn't match the agent specified environment" do
-        Puppet[:environment] = 'second_env'
-        configurer = Puppet::Configurer.new
+        @agent.instance_variable_set(:@environment, 'second_env')
+        expects_new_catalog_only(@catalog)
 
-        catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote("production"))
-        expects_new_catalog_only(catalog)
-
-        expect(Puppet).to receive(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
-        expect(configurer.run).to be_nil
+        Puppet.expects(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
+        expect(@agent.run).to be_nil
       end
 
-      it "should return 0 when the catalog's environment matches the agent specified environment" do
-        expects_new_catalog_only(catalog)
+      it "should not return nil when the catalog's environment matches the agent specified environment" do
+        @agent.instance_variable_set(:@environment, 'production')
+        expects_new_catalog_only(@catalog)
 
-        expect(configurer.run).to eq(0)
+        expect(@agent.run).to eq(0)
       end
 
       describe "and a cached catalog is explicitly requested" do
@@ -743,274 +778,209 @@ describe Puppet::Configurer do
         end
 
         it "should return nil when the cached catalog's environment doesn't match the agent specified environment" do
-          Puppet[:environment] = 'second_env'
-          configurer = Puppet::Configurer.new
-
-          catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote("production"))
-          expects_cached_catalog_only(catalog)
+          @agent.instance_variable_set(:@environment, 'second_env')
+          expects_cached_catalog_only(@catalog)
 
-          expect(Puppet).to receive(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
-          expect(configurer.run).to be_nil
+          Puppet.expects(:err).with("Not using catalog because its environment 'production' does not match agent specified environment 'second_env' and strict_environment_mode is set")
+          expect(@agent.run).to be_nil
         end
 
         it "should proceed with the cached catalog if its environment matchs the local environment" do
-          expects_cached_catalog_only(catalog)
+          Puppet.settings[:use_cached_catalog] = true
+          @agent.instance_variable_set(:@environment, 'production')
+          expects_cached_catalog_only(@catalog)
 
-          expect(configurer.run).to eq(0)
+          expect(@agent.run).to eq(0)
         end
       end
     end
 
-    it "should set its cached_catalog_status to 'not_used' when downloading a new catalog" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(catalog)
+    it "should use the Catalog class to get its catalog" do
+      Puppet::Resource::Catalog.indirection.expects(:find).returns @catalog
 
-      options = {}
-      configurer.run(options)
+      @agent.retrieve_catalog({})
+    end
+
+    it "should set its cached_catalog_status to 'not_used' when downloading a new catalog" do
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns @catalog
 
-      expect(options[:report].cached_catalog_status).to eq('not_used')
+      @agent.retrieve_catalog({})
+      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
     end
 
     it "should use its node_name_value to retrieve the catalog" do
-      myhost_facts = Puppet::Node::Facts.new("myhost.domain.com")
-      Puppet::Node::Facts.indirection.save(myhost_facts)
-
+      Facter.stubs(:value).returns "eh"
       Puppet.settings[:node_name_value] = "myhost.domain.com"
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with("myhost.domain.com", anything).and_return(catalog)
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| name == "myhost.domain.com" }.returns @catalog
 
-      configurer.run
+      @agent.retrieve_catalog({})
     end
 
-    it "should log when no catalog can be retrieved from the server" do
-      expects_fallback_to_cached_catalog(catalog)
+    it "should default to returning a catalog retrieved directly from the server, skipping the cache" do
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns @catalog
 
-      allow(Puppet).to receive(:info)
-      expect(Puppet).to receive(:info).with("Using cached catalog from environment 'production'")
-      configurer.run
+      expect(@agent.retrieve_catalog({})).to eq(@catalog)
     end
 
-    it "should set its cached_catalog_status to 'on_failure' when no catalog can be retrieved from the server" do
-      expects_fallback_to_cached_catalog(catalog)
+    it "should log and return the cached catalog when no catalog can be retrieved from the server" do
+      expects_fallback_to_cached_catalog(@catalog)
 
-      options = {}
-      configurer.run(options)
+      Puppet.expects(:info).with("Using cached catalog from environment 'production'")
+      expect(@agent.retrieve_catalog({})).to eq(@catalog)
+    end
 
-      expect(options[:report].cached_catalog_status).to eq('on_failure')
+    it "should set its cached_catalog_status to 'on_failure' when no catalog can be retrieved from the server" do
+      expects_fallback_to_cached_catalog(@catalog)
+
+      @agent.retrieve_catalog({})
+      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
     end
 
     it "should not look in the cache for a catalog if one is returned from the server" do
-      expects_new_catalog_only(catalog)
+      expects_new_catalog_only(@catalog)
 
-      configurer.run
+      expect(@agent.retrieve_catalog({})).to eq(@catalog)
     end
 
     it "should return the cached catalog when retrieving the remote catalog throws an exception" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_raise("eh")
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.raises "eh"
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns @catalog
 
-      configurer.run
+      expect(@agent.retrieve_catalog({})).to eq(@catalog)
     end
 
     it "should set its cached_catalog_status to 'on_failure' when retrieving the remote catalog throws an exception" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_raise("eh")
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_terminus: true)).and_return(catalog)
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.raises "eh"
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_terminus] == true }.returns @catalog
 
-      options = {}
-      configurer.run(options)
-
-      expect(options[:report].cached_catalog_status).to eq('on_failure')
+      @agent.retrieve_catalog({})
+      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
     end
 
     it "should log and return nil if no catalog can be retrieved from the server and :usecacheonfailure is disabled" do
       Puppet[:usecacheonfailure] = false
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
 
-      expect(Puppet).to receive(:warning).with('Not using cache on failed catalog')
+      Puppet.expects(:warning).with('Not using cache on failed catalog')
 
-      expect(configurer.run).to be_nil
+      expect(@agent.retrieve_catalog({})).to be_nil
     end
 
     it "should set its cached_catalog_status to 'not_used' if no catalog can be retrieved from the server and :usecacheonfailure is disabled or fails to retrieve a catalog" do
       Puppet[:usecacheonfailure] = false
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).with(anything, hash_including(ignore_cache: true)).and_return(nil)
-
-      options = {}
-      configurer.run(options)
+      Puppet::Resource::Catalog.indirection.expects(:find).with { |name, options| options[:ignore_cache] == true }.returns nil
 
-      expect(options[:report].cached_catalog_status).to eq('not_used')
+      @agent.retrieve_catalog({})
+      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
     end
 
     it "should return nil if no cached catalog is available and no catalog can be retrieved from the server" do
       expects_neither_new_or_cached_catalog
 
-      expect(configurer.run).to be_nil
+      expect(@agent.retrieve_catalog({})).to be_nil
     end
 
     it "should return nil if its cached catalog environment doesn't match server-specified environment" do
       cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
+      @agent.instance_variable_set(:@node_environment, 'production')
 
       expects_fallback_to_cached_catalog(cached_catalog)
 
-      allow(Puppet).to receive(:err)
-      expect(Puppet).to receive(:err).with("Not using cached catalog because its environment 'second_env' does not match 'production'")
-      expect(configurer.run).to be_nil
+      Puppet.expects(:err).with("Not using cached catalog because its environment 'second_env' does not match 'production'")
+      expect(@agent.retrieve_catalog({})).to be_nil
     end
 
     it "should set its cached_catalog_status to 'not_used' if the cached catalog environment doesn't match server-specified environment" do
       cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote('second_env'))
+      @agent.instance_variable_set(:@node_environment, 'production')
 
       expects_fallback_to_cached_catalog(cached_catalog)
 
-      options = {}
-      configurer.run(options)
-      expect(options[:report].cached_catalog_status).to eq('not_used')
+      @agent.retrieve_catalog({})
+      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('not_used')
     end
 
-    it "should set its cached_catalog_status to 'on_failure' if the cached catalog environment matches server-specified environment" do
-      expects_fallback_to_cached_catalog(catalog)
+    it "should return its cached catalog if the environment matches the server-specified environment" do
+      cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment]))
+      @agent.instance_variable_set(:@node_environment, cached_catalog.environment)
 
-      options = {}
-      configurer.run(options)
-      expect(options[:report].cached_catalog_status).to eq('on_failure')
-    end
-
-    it "should not update the cached catalog in noop mode" do
-      Puppet[:noop] = true
-
-      stub_request(:get, %r{/puppet/v3/catalog}).to_return(:status => 200, :body => catalog.render(:json), :headers => {'Content-Type' => 'application/json'})
-
-      Puppet::Resource::Catalog.indirection.cache_class = :json
-      path = Puppet::Resource::Catalog.indirection.cache.path(catalog.name)
+      expects_fallback_to_cached_catalog(cached_catalog)
 
-      expect(File).to_not be_exist(path)
-      configurer.run
-      expect(File).to_not be_exist(path)
+      expect(@agent.retrieve_catalog({})).to eq(cached_catalog)
     end
 
-    it "should update the cached catalog when not in noop mode" do
-      Puppet[:noop] = false
-      Puppet[:log_level] = 'info'
-
-      stub_request(:get, %r{/puppet/v3/catalog}).to_return(:status => 200, :body => catalog.render(:json), :headers => {'Content-Type' => 'application/json'})
-
-      Puppet::Resource::Catalog.indirection.cache_class = :json
-      cache_path = Puppet::Resource::Catalog.indirection.cache.path(Puppet[:node_name_value])
+    it "should set its cached_catalog_status to 'on_failure' if the cached catalog environment matches server-specified environment" do
+      cached_catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment]))
+      @agent.instance_variable_set(:@node_environment, cached_catalog.environment)
 
-      expect(File).to_not be_exist(cache_path)
-      configurer.run
-      expect(File).to be_exist(cache_path)
+      expects_fallback_to_cached_catalog(cached_catalog)
 
-      expect(@logs).to include(an_object_having_attributes(level: :info, message: "Caching catalog for #{Puppet[:node_name_value]}"))
+      @agent.retrieve_catalog({})
+      expect(@agent.instance_variable_get(:@cached_catalog_status)).to eq('on_failure')
     end
 
-    it "successfully applies the catalog without a cache" do
-      stub_request(:get, %r{/puppet/v3/catalog}).to_return(:status => 200, :body => catalog.render(:json), :headers => {'Content-Type' => 'application/json'})
-
-      Puppet::Resource::Catalog.indirection.cache_class = nil
+    it "should not update the cached catalog in noop mode" do
+      Puppet[:noop] = true
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:ignore_cache => true, :ignore_cache_save => true)).returns(@catalog)
 
-      expect(configurer.run).to eq(0)
+      @agent.retrieve_catalog({})
     end
 
-    it "should not update the cached catalog when running puppet apply" do
-      Puppet::Resource::Catalog.indirection.cache_class = :json
-      path = Puppet::Resource::Catalog.indirection.cache.path(catalog.name)
+    it "should update the cached catalog when not in noop mode" do
+      Puppet[:noop] = false
+      Puppet::Resource::Catalog.indirection.expects(:find).with(anything, has_entries(:ignore_cache => true, :ignore_cache_save => false)).returns(@catalog)
 
-      expect(File).to_not be_exist(path)
-      configurer.run(catalog: catalog)
-      expect(File).to_not be_exist(path)
+      @agent.retrieve_catalog({})
     end
   end
 
-  describe "when converging the environment" do
-    let(:apple) { Puppet::Resource::Catalog.new(Puppet[:node_name_value], Puppet::Node::Environment.remote('apple')) }
-    let(:banana) { Puppet::Resource::Catalog.new(Puppet[:node_name_value], Puppet::Node::Environment.remote('banana')) }
-
-    before :each do
-      apple.add_resource(resource)
-      banana.add_resource(resource)
-    end
-
-    it "converges after multiple attempts" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(apple, banana, banana)
-
-      allow(Puppet).to receive(:notice)
-      expect(Puppet).to receive(:notice).with("Local environment: 'production' doesn't match server specified environment 'apple', restarting agent run with environment 'apple'")
-      expect(Puppet).to receive(:notice).with("Local environment: 'apple' doesn't match server specified environment 'banana', restarting agent run with environment 'banana'")
-
-      configurer.run
-    end
-
-    it "raises if it can't converge after 4 tries after the initial catalog request" do
-      expect(Puppet::Resource::Catalog.indirection).to receive(:find).and_return(apple, banana, apple, banana, apple)
-
-      expect(Puppet).to receive(:err).with("Failed to apply catalog: Catalog environment didn't stabilize after 4 fetches, aborting run")
+  describe "when converting the catalog" do
+    before do
+      Puppet.settings.stubs(:use).returns(true)
 
-      configurer.run
+      catalog.stubs(:to_ral).returns ral_catalog
     end
-  end
 
-  describe "when converting the catalog" do
-    it "converts Puppet::Resource into Puppet::Type::Notify" do
-      expect(configurer).to receive(:apply_catalog) do |ral, _|
-        expect(ral.resources).to contain(an_instance_of(Puppet::Type::Notify))
-      end
+    let (:catalog) { Puppet::Resource::Catalog.new('tester', Puppet::Node::Environment.remote(Puppet[:environment].to_sym)) }
+    let (:ral_catalog) { Puppet::Resource::Catalog.new('tester', Puppet::Node::Environment.remote(Puppet[:environment].to_sym)) }
 
-      configurer.run(catalog: catalog)
+    it "should convert the catalog to a RAL-formed catalog" do
+      expect(@agent.convert_catalog(catalog, 10)).to equal(ral_catalog)
     end
 
-    it "adds default schedules" do
-      expect(configurer).to receive(:apply_catalog) do |ral, _|
-        expect(ral.resources.map(&:to_ref)).to contain(%w{Schedule[puppet] Schedule[hourly] Schedule[daily] Schedule[weekly] Schedule[monthly] Schedule[never]})
-      end
+    it "should finalize the catalog" do
+      ral_catalog.expects(:finalize)
 
-      configurer.run
+      @agent.convert_catalog(catalog, 10)
     end
 
-    it "records the retrieval duration to the catalog" do
-      expect(configurer).to receive(:apply_catalog) do |ral, _|
-        expect(ral.retrieval_duration).to be_an_instance_of(Float)
-      end
+    it "should record the passed retrieval time with the RAL catalog" do
+      ral_catalog.expects(:retrieval_duration=).with 10
 
-      configurer.run
+      @agent.convert_catalog(catalog, 10)
     end
 
-    it "writes the class file containing applied settings classes" do
-      expect(File).to_not be_exist(Puppet[:classfile])
+    it "should write the RAL catalog's class file" do
+      ral_catalog.expects(:write_class_file)
 
-      configurer.run
-
-      expect(File.read(Puppet[:classfile]).chomp).to eq('settings')
+      @agent.convert_catalog(catalog, 10)
     end
 
-    it "writes an empty resource file since no resources are 'managed'" do
-      expect(File).to_not be_exist(Puppet[:resourcefile])
-
-      configurer.run
+    it "should write the RAL catalog's resource file" do
+      ral_catalog.expects(:write_resource_file)
 
-      expect(File.read(Puppet[:resourcefile]).chomp).to eq("")
+      @agent.convert_catalog(catalog, 10)
     end
 
-    it "adds the conversion time to the report" do
-      configurer.run(report: report)
+    it "should set catalog conversion time on the report" do
+      report = Puppet::Transaction::Report.new
 
-      expect(report.metrics['time']['convert_catalog']).to be_an_instance_of(Float)
+      report.expects(:add_times).with(:convert_catalog, kind_of(Numeric))
+      @agent.convert_catalog(catalog, 10, {:report => report})
     end
   end
 
   describe "when determining whether to pluginsync" do
-    it "should default to Puppet[:pluginsync] when explicitly set by the commandline" do
-      Puppet.settings[:pluginsync] = false
-      expect(Puppet.settings).to receive(:set_by_cli?).and_return(true)
-
-      expect(described_class).not_to be_should_pluginsync
-    end
-
-    it "should default to Puppet[:pluginsync] when explicitly set by config" do
-      Puppet.settings[:pluginsync] = false
-      expect(Puppet.settings).to receive(:set_by_config?).and_return(true)
-
-      expect(described_class).not_to be_should_pluginsync
-    end
-
     it "should be true if use_cached_catalog is false" do
       Puppet.settings[:use_cached_catalog] = false
 
@@ -1027,70 +997,55 @@ describe Puppet::Configurer do
   describe "when attempting failover" do
     it "should not failover if server_list is not set" do
       Puppet.settings[:server_list] = []
-      configurer.run
+      @agent.expects(:find_functional_server).never
+      @agent.run
     end
 
     it "should not failover during an apply run" do
       Puppet.settings[:server_list] = ["myserver:123"]
+      @agent.expects(:find_functional_server).never
       catalog = Puppet::Resource::Catalog.new("tester", Puppet::Node::Environment.remote(Puppet[:environment].to_sym))
-      configurer.run(catalog: catalog)
+      @agent.run :catalog => catalog
     end
 
-    it "should select a server when it receives 200 OK response" do
+    it "should select a server when provided" do
       Puppet.settings[:server_list] = ["myserver:123"]
-
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 200)
+      response = Net::HTTPOK.new(nil, 200, 'OK')
+      Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(mock('request', get: response))
+      @agent.stubs(:run_internal)
 
       options = {}
-      configurer.run(options)
-      expect(options[:report].master_used).to eq('myserver:123')
-    end
-
-    it "should select a server when it receives 403 Forbidden" do
-      Puppet.settings[:server_list] = ["myserver:123"]
-
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 403)
-
-      options = {}
-      configurer.run(options)
+      @agent.run(options)
       expect(options[:report].master_used).to eq('myserver:123')
     end
 
     it "should report when a server is unavailable" do
       Puppet.settings[:server_list] = ["myserver:123"]
+      response = Net::HTTPInternalServerError.new(nil, 500, 'Internal Server Error')
+      Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(mock('request', get: response))
+      @agent.stubs(:run_internal)
 
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: [500, "Internal Server Error"])
-
-      allow(Puppet).to receive(:debug)
-      expect(Puppet).to receive(:debug).with("Puppet server myserver:123 is unavailable: 500 Internal Server Error")
-      expect {
-        configurer.run
-      }.to raise_error(Puppet::Error, /Could not select a functional puppet master from server_list:/)
+      Puppet.expects(:debug).with("Puppet server myserver:123 is unavailable: 500 Internal Server Error")
+      @agent.run
     end
 
-    it "should error when no servers in 'server_list' are reachable" do
-      Puppet.settings[:server_list] = "myserver:123,someotherservername"
-
-      stub_request(:get, 'https://myserver/status/v1/simple/master').to_return(status: 400)
-      stub_request(:get, 'https://someotherservername/status/v1/simple/master').to_return(status: 400)
+    it "should fallback to an empty server when failover fails" do
+      Puppet.settings[:server_list] = ["myserver:123"]
+      error = Net::HTTPError.new(400, 'dummy server communication error')
+      Puppet::Network::HttpPool.stubs(:http_ssl_instance).with('myserver', '123').returns(error)
+      @agent.stubs(:run_internal)
 
-      expect{
-        configurer.run
-      }.to raise_error(Puppet::Error, /Could not select a functional puppet master from server_list: 'myserver:123,someotherservername'/)
+      options = {}
+      @agent.run(options)
+      expect(options[:report].master_used).to be_nil
     end
 
-    it "should not make multiple node requests when the server is found" do
+    it "should not make multiple node requets when the server is found" do
       Puppet.settings[:server_list] = ["myserver:123"]
-      Puppet::Node.indirection.terminus_class = :rest
-      Puppet::Resource::Catalog.indirection.terminus_class = :rest
-
-      stub_request(:get, 'https://myserver:123/status/v1/simple/master').to_return(status: 200)
-      stub_request(:get, %r{https://myserver:123/puppet/v3/catalog}).to_return(status: 200)
-      node_request = stub_request(:get, %r{https://myserver:123/puppet/v3/node/}).to_return(status: 200)
-
-      configurer.run
+      Puppet::Network::HttpPool.expects(:http_ssl_instance).once
+      @agent.stubs(:run_internal)
 
-      expect(node_request).to have_been_requested.once
+      @agent.run
     end
   end
 end