puppet 5.5.22 → 6.0.0

data/man/man8/puppet-node.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-NODE" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.
@@ -71,6 +71,9 @@ Cleans up the following information a puppet master knows about a node:
 .IP
 \fIReports\fR \- ($vardir/reports/node\.domain)
 .
+.IP
+NOTE: this action now cleans up certs via Puppet Server\'s CA API\. A running server is required for certs to be cleaned\.
+.
 .TP
 \fBfind\fR \- Retrieve a node object\.
 \fBSYNOPSIS\fR
@@ -134,9 +137,6 @@ This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \
 \fBexec\fR
 .
 .IP "\(bu" 4
-\fBldap\fR
-.
-.IP "\(bu" 4
 \fBmemory\fR
 .
 .IP "\(bu" 4
@@ -152,9 +152,6 @@ This subcommand is an indirector face, which exposes \fBfind\fR, \fBsearch\fR, \
 \fBstore_configs\fR
 .
 .IP "\(bu" 4
-\fBwrite_only_yaml\fR
-.
-.IP "\(bu" 4
 \fByaml\fR
 .
 .IP "" 0

data/man/man8/puppet-parser.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PARSER" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-parser\fR \- Interact directly with the parser\.

data/man/man8/puppet-plugin.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PLUGIN" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.

data/man/man8/puppet-report.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-REPORT" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/man/man8/puppet-script.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SCRIPT" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog

data/man/man8/puppet-ssl.8

@@ -0,0 +1,28 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "PUPPET\-SSL" "8" "September 2018" "Puppet, Inc." "Puppet manual"
+.
+.SH "NAME"
+\fBpuppet\-ssl\fR \- Manage SSL keys and certificates for puppet SSL clients
+.
+.SH "SYNOPSIS"
+Manage SSL keys and certificates for an SSL clients needed to communicate with a puppet infrastructure\.
+.
+.SH "USAGE"
+puppet ssl \fIaction\fR [\-\-certname \fINAME\fR]
+.
+.SH "ACTIONS"
+.
+.TP
+submit_request
+Generate a certificate signing request (CSR) and submit it to the CA\. If a private and public key pair already exist, they will be used to generate the CSR\. Otherwise a new key pair will be generated\. If a CSR has already been submitted with the given \fBcertname\fR, then the operation will fail\.
+.
+.TP
+download_cert
+Download a certificate for this host\. If the current private key matches the downloaded certificate, then the certificate will be saved and used for subsequent requests\. If there is already an existing certificate, it will be overwritten\.
+.
+.TP
+verify
+Verify the private key and certificate are present and match, verify the certificate is issued by a trusted CA, and check revocation status\.
+

data/man/man8/puppet-status.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-STATUS" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-status\fR \- View puppet server status\.

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "October 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "September 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -13,7 +13,16 @@ Usage: puppet \fIsubcommand\fR [options] \fIaction\fR [options]
 Available subcommands:
 .
 .P
-agent The puppet agent daemon apply Apply Puppet manifests locally ca Local Puppet Certificate Authority management\. (Deprecated) catalog Compile, save, view, and convert catalogs\. cert Manage certificates and requests (Deprecated) certificate Provide access to the CA for certificate management\. (Deprecated) certificate_request Manage certificate requests\. (Deprecated) certificate_revocation_list Manage the list of revoked certificates\. (Deprecated) config Interact with Puppet\'s settings\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. help Display Puppet help\. key Create, save, and remove certificate keys\. (Deprecated) lookup Interactive Hiera lookup man Display Puppet manual pages\. (Deprecated) master The puppet master daemon module Creates, installs and searches for modules on the Puppet Forge\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. report Create, display, and submit reports\. resource The resource abstraction layer shell script Run a puppet manifests as a script without compiling a catalog status View puppet server status\. (Deprecated)
+Common:
+.
+.br
+agent The puppet agent daemon apply Apply Puppet manifests locally config Interact with Puppet\'s settings\. help Display Puppet help\. lookup Interactive Hiera lookup module Creates, installs and searches for modules on the Puppet Forge\. resource The resource abstraction layer shell
+.
+.P
+Specialized:
+.
+.br
+catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.5\.22
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.0\.0

data/spec/fixtures/unit/functions/hiera/hiera/backend/hieraspec_backend.rb

@@ -0,0 +1,22 @@
+class Hiera::Backend::Hieraspec_backend
+  def initialize(cache = nil)
+    Hiera.debug('Custom_backend starting')
+  end
+
+  def lookup(key, scope, order_override, resolution_type, context)
+    case key
+    when 'datasources'
+      Hiera::Backend.datasources(scope, order_override) { |source| source }
+    when 'resolution_type'
+      if resolution_type == :hash
+        { key => resolution_type.to_s }
+      elsif resolution_type == :array
+        [ key, resolution_type.to_s ]
+      else
+        "resolution_type=#{resolution_type}"
+      end
+    else
+      throw :no_such_key
+    end
+  end
+end

data/spec/fixtures/unit/functions/lookup/hiera/backend/custom_backend.rb

@@ -0,0 +1,18 @@
+class Hiera::Backend::Custom_backend
+  def lookup(key, scope, order_override, resolution_type, context)
+    case key
+    when 'hash_c'
+      { 'hash_ca' => { 'cad' => 'value hash_c.hash_ca.cad (from global custom)' }}
+    when 'hash'
+      { 'array' => [ 'x5,x6' ] }
+    when 'array'
+      [ 'x5,x6' ]
+    when 'datasources'
+      Hiera::Backend.datasources(scope, order_override) { |source| source }
+    when 'dotted.key'
+      'custom backend received request for dotted.key value'
+    else
+      throw :no_such_key
+    end
+  end
+end

data/spec/fixtures/unit/functions/lookup/hiera/backend/other_backend.rb

@@ -0,0 +1,7 @@
+class Hiera::Backend::Other_backend
+  def lookup(key, scope, order_override, resolution_type, context)
+    value = Hiera::Config[:other][key.to_sym]
+    throw :no_such_key if value.nil?
+    value
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/dependent_modules_with_metadata/modules/user/manifests/init.pp

@@ -1,12 +1,12 @@
-function puppet_init_calling_puppet() {
+function user::puppet_init_calling_puppet() {
   usee::usee_puppet()
 }
 
-function puppet_init_calling_puppet_init() {
+function user::puppet_init_calling_puppet_init() {
   usee_puppet_init()
 }
 
-function puppet_init_calling_ruby() {
+function user::puppet_init_calling_ruby() {
   usee::usee_ruby()
 }
 
@@ -53,18 +53,18 @@ class user {
     7: {
       # Call a puppet function that resides in usee/functions from a puppet function in init.pp
       #
-      notify { 'case_7': message => puppet_init_calling_puppet() }
+      notify { 'case_7': message => user::puppet_init_calling_puppet() }
     }
     8: {
       # Call a puppet function that resides in usee/manifests/init.pp from a puppet function in init.pp
       #
       include usee
-      notify { 'case_8': message => puppet_init_calling_puppet_init() }
+      notify { 'case_8': message => user::puppet_init_calling_puppet_init() }
     }
     9: {
       # Call a ruby function that resides in usee from a puppet function in init.pp
       #
-      notify { 'case_9': message => puppet_init_calling_ruby() }
+      notify { 'case_9': message => user::puppet_init_calling_ruby() }
     }
     10: {
       # Call a puppet function that resides in usee/functions from a ruby function in this module

data/spec/fixtures/unit/provider/package/pkgng/pkg.info

@@ -1,7 +1,6 @@
 ca_root_nss 3.15.3.1 security/ca_root_nss
 curl 7.33.0 ftp/curl
 gnupg 2.0.22 security/gnupg
-mcollective 2.2.4 sysutils/mcollective
 nmap 6.40 security/nmap
 pkg 1.2.4_1 ports-mgmt/pkg
 zsh 5.0.2_1 shells/zsh

data/spec/fixtures/unit/provider/package/pkgng/pkg.version

@@ -1,5 +1,3 @@
 shells/bash-completion             <   needs updating (index has 2.1_3)
 ftp/curl                           <   needs updating (index has 7.33.0_2)
 shells/zsh                         <   needs updating (index has 5.0.4)
-sysutils/orphan                    ?   orphaned: sysutils/orphan
-sysutils/broken                    !   Comparison failed

data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services

@@ -5,12 +5,3 @@ autovt@.service                             disabled
 avahi-daemon.service                        enabled
 blk-availability.service                    disabled
 brandbot.service                            static
-apparmor.service                            bad
-udev.service                                enabled-runtime
-ufw.service                                 linked
-umountfs.service                            linked-runtime
-umountnfs.service                           masked
-umountroot.service                          masked-runtime
-urandom.service                             indirect
-user@.service                               generated
-uuidd.service                               transient

data/spec/integration/agent/logging_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet'
@@ -69,9 +70,9 @@ describe 'agent logging' do
   shared_examples "an agent" do |argv, expected|
     before(:each) do
       # Don't actually run the agent, bypassing cert checks, forking and the puppet run itself
-      allow_any_instance_of(Puppet::Application::Agent).to receive(:run_command)
+      Puppet::Application::Agent.any_instance.stubs(:run_command)
       # Let exceptions be raised instead of exiting
-      allow_any_instance_of(Puppet::Application::Agent).to receive(:exit_on_fail).and_yield
+      Puppet::Application::Agent.any_instance.stubs(:exit_on_fail).yields
     end
 
     def double_of_bin_puppet_agent_call(argv)
@@ -80,7 +81,7 @@ describe 'agent logging' do
       command_line.execute
     end
 
-    if Puppet.features.microsoft_windows? && argv.include?(DAEMONIZE)
+    if Puppet::Util::Platform.windows? && argv.include?(DAEMONIZE)
 
       it "should exit on a platform which cannot daemonize if the --daemonize flag is set" do
         expect { double_of_bin_puppet_agent_call(argv) }.to raise_error(SystemExit)
@@ -95,15 +96,16 @@ describe 'agent logging' do
           #
           # It's not something we are specifically testing here since it occurs
           # regardless of user flags.
-          expect(Puppet::Util::Log).to receive(:newdestination).with(instance_of(Puppet::Transaction::Report))
+          Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).at_least_once
           expected[:loggers].each do |logclass|
-            expect(Puppet::Util::Log).to receive(:newdestination).with(logclass)
+            Puppet::Util::Log.expects(:newdestination).with(logclass).at_least_once
           end
           double_of_bin_puppet_agent_call(argv)
 
           expect(Puppet::Util::Log.level).to eq(expected[:level])
         end
       end
+
     end
   end
 
@@ -126,7 +128,7 @@ describe 'agent logging' do
     loggers << CONSOLE if verbose_or_debug_set_in_argv(argv)
     loggers << 'console' if log_dest_is_set_to(argv, LOGDEST_CONSOLE)
     loggers << '/dev/null/foo' if log_dest_is_set_to(argv, LOGDEST_FILE)
-    if Puppet.features.microsoft_windows?
+    if Puppet::Util::Platform.windows?
       # an explicit call to --logdest syslog on windows is swallowed silently with no
       # logger created (see #suitable() of the syslog Puppet::Util::Log::Destination subclass)
       # however Puppet::Util::Log.newdestination('syslog') does get called...so we have
@@ -171,7 +173,7 @@ describe 'agent logging' do
         argv = (onetime_daemonize_args + [log_level_args, log_dest_args]).flatten.compact
 
         describe "for #{argv}" do
-          it_should_behave_like("an agent", argv, with_expectations_based_on(argv))
+          it_should_behave_like( "an agent", argv, with_expectations_based_on(argv))
         end
       end
     end

data/spec/integration/application/apply_spec.rb

@@ -7,6 +7,8 @@ describe "apply" do
 
   before :each do
     Puppet[:reports] = "none"
+    # Let exceptions be raised instead of exiting
+    Puppet::Application.any_instance.stubs(:exit_on_fail).yields
   end
 
   describe "when applying provided catalogs" do
@@ -97,7 +99,7 @@ end
         apply.options[:catalog] = file_containing('manifest', catalog.to_json)
 
         Puppet[:environmentpath] = envdir
-        expect_any_instance_of(Puppet::Pops::Loader::Runtime3TypeLoader).not_to receive(:find)
+        Puppet::Pops::Loader::Runtime3TypeLoader.any_instance.expects(:find).never
         expect { apply.run }.to have_printed(/the Puppet::Type says hello.*applytest was here/m)
       end
 
@@ -108,8 +110,8 @@ end
         tn = Puppet::Pops::Loader::TypedName.new(:resource_type_pp, 'applytest')
         rt = Puppet::Pops::Resource::ResourceTypeImpl.new('applytest', [Puppet::Pops::Resource::Param.new(String, 'message')], [Puppet::Pops::Resource::Param.new(String, 'name', true)])
 
-        expect(compiler.loaders.runtime3_type_loader.instance_variable_get(:@resource_3x_loader)).to receive(:set_entry).once.with(tn, rt, instance_of(String))
-          .and_return(Puppet::Pops::Loader::Loader::NamedEntry.new(tn, rt, nil))
+        compiler.loaders.runtime3_type_loader.instance_variable_get(:@resource_3x_loader).expects(:set_entry).once.with(tn, rt, is_a(String))
+          .returns(Puppet::Pops::Loader::Loader::NamedEntry.new(tn, rt, nil))
         expect { compiler.compile }.not_to have_printed(/the Puppet::Type says hello/)
       end
 
@@ -237,7 +239,7 @@ end
     Puppet.override(:current_environment => special) do
       Puppet[:environment] = 'special'
       puppet = Puppet::Application[:apply]
-      allow(puppet).to receive(:command_line).and_return(double('command_line', :args => [manifest]))
+      puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
       expect { puppet.run_command }.to exit_with(0)
     end
 
@@ -248,14 +250,14 @@ end
     manifest = file_containing("manifest.pp", "notice(\"$server_facts\")")
 
     puppet = Puppet::Application[:apply]
-    allow(puppet).to receive(:command_line).and_return(double('command_line', :args => [manifest]))
+    puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
 
     expect { puppet.run_command }.to exit_with(0)
 
     expect(@logs.map(&:to_s)).to include(/{environment =>.*/)
   end
 
-  it "applies a given file even when an ENC is configured", :if => !Puppet.features.microsoft_windows? do
+  it "applies a given file even when an ENC is configured", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
     manifest = file_containing("manifest.pp", "notice('specific manifest applied')")
     enc = script_containing('enc_script',
       :windows => '@echo classes: []' + "\n" + '@echo environment: special',
@@ -269,7 +271,7 @@ end
       Puppet[:node_terminus] = 'exec'
       Puppet[:external_nodes] = enc
       puppet = Puppet::Application[:apply]
-      allow(puppet).to receive(:command_line).and_return(double('command_line', :args => [manifest]))
+      puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
       expect { puppet.run_command }.to exit_with(0)
     end
 
@@ -279,7 +281,7 @@ end
   context "handles errors" do
     it "logs compile errors once" do
       Puppet.initialize_settings([])
-      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => []))
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => []))
       apply.options[:code] = '08'
 
       msg = 'valid octal'
@@ -294,7 +296,7 @@ end
 
     it "logs compile post processing errors once" do
       Puppet.initialize_settings([])
-      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => []))
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => []))
       path = File.expand_path('/tmp/content_file_test.Q634Dlmtime')
       apply.options[:code] = "file { '#{path}':
         content => 'This is the test file content',
@@ -336,7 +338,7 @@ end
 
     def init_cli_args_and_apply_app(args, execute)
       Puppet.initialize_settings(args)
-      puppet = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => args))
+      puppet = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => args))
       puppet.options[:code] = execute
       return puppet
     end
@@ -376,7 +378,7 @@ end
     # External node script execution will fail, likely due to the tampering
     # with the basic file descriptors.
     # Workaround: Define a log destination and merely inspect logs.
-    context "with an ENC" do
+    context "with an ENC", :unless => RUBY_PLATFORM == 'java' do
       let(:logdest) { tmpfile('logdest') }
       let(:args) { ['-e', execute, '--logdest', logdest ] }
       let(:enc) do
@@ -406,7 +408,7 @@ end
     end
   end
 
-  context 'when compiling a provided catalog with rich data and then applying from file' do
+  context 'when applying from file' do
     include PuppetSpec::Compiler
 
     let(:env_dir) { tmpdir('environments') }
@@ -460,17 +462,21 @@ class amod::bad_type {
     let(:env) { Puppet::Node::Environment.create(env_name.to_sym, [File.join(populated_env_dir, 'spec', 'modules')]) }
     let(:node) { Puppet::Node.new('test', :environment => env) }
 
-    around(:each) do |example|
+    before(:each) do
       Puppet[:rich_data] = rich_data
-      Puppet.override(:loaders => Puppet::Pops::Loaders.new(env)) { example.run }
+      Puppet.push_context(:loaders => Puppet::Pops::Loaders.new(env))
+    end
+
+    after(:each) do
+      Puppet.pop_context()
     end
 
-    context 'and rich_data is set to false during compile' do
+    context 'and the file is not serialized with rich_data' do
       it 'will notify a string that is the result of Regexp#inspect (from Runtime3xConverter)' do
         catalog = compile_to_catalog(execute, node)
         apply = Puppet::Application[:apply]
         apply.options[:catalog] = file_containing('manifest', catalog.to_json)
-        expect(apply).to receive(:apply_catalog) do |cat|
+        apply.expects(:apply_catalog).with do |cat|
           expect(cat.resource(:notify, 'rx')['message']).to be_a(String)
           expect(cat.resource(:notify, 'bin')['message']).to be_a(String)
           expect(cat.resource(:notify, 'ver')['message']).to be_a(String)
@@ -478,7 +484,6 @@ class amod::bad_type {
           expect(cat.resource(:notify, 'tspan')['message']).to be_a(String)
           expect(cat.resource(:notify, 'tstamp')['message']).to be_a(String)
         end
-
         apply.run
       end
 
@@ -486,10 +491,9 @@ class amod::bad_type {
         json = compile_to_catalog('include amod::bad_type', node).to_json
         apply = Puppet::Application[:apply]
         apply.options[:catalog] = file_containing('manifest', json)
-        expect(apply).to receive(:apply_catalog) do |cat|
-          expect(cat.resource(:notify, 'bogus')['message']).to be_a(String)
+        apply.expects(:apply_catalog).with do |catalog|
+          expect(catalog.resource(:notify, 'bogus')['message']).to be_a(String)
         end
-
         apply.run
       end
 
@@ -504,14 +508,15 @@ class amod::bad_type {
       end
     end
 
-    context 'and rich_data is set to true during compile' do
-      let(:rich_data) { true }
-
+    context 'and the file is serialized with rich_data' do
       it 'will notify a regexp using Regexp#to_s' do
         catalog = compile_to_catalog(execute, node)
         apply = Puppet::Application[:apply]
-        apply.options[:catalog] = file_containing('manifest', catalog.to_json)
-        expect(apply).to receive(:apply_catalog) do |cat|
+        serialized_catalog = Puppet.override(rich_data: true) do
+          catalog.to_json
+        end
+        apply.options[:catalog] = file_containing('manifest', serialized_catalog)
+        apply.expects(:apply_catalog).with do |cat|
           expect(cat.resource(:notify, 'rx')['message']).to be_a(Regexp)
           expect(cat.resource(:notify, 'bin')['message']).to be_a(Puppet::Pops::Types::PBinaryType::Binary)
           expect(cat.resource(:notify, 'ver')['message']).to be_a(SemanticPuppet::Version)
@@ -519,9 +524,9 @@ class amod::bad_type {
           expect(cat.resource(:notify, 'tspan')['message']).to be_a(Puppet::Pops::Time::Timespan)
           expect(cat.resource(:notify, 'tstamp')['message']).to be_a(Puppet::Pops::Time::Timestamp)
         end
-
         apply.run
       end
     end
+
   end
 end