diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | spec/lib/puppet_spec/compiler.rb | 9 | ||||
| -rw-r--r-- | spec/unit/provider/cron/parsed_spec.rb | 12 |
3 files changed, 17 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 8e71538..e8c30de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ rvm: - 2.5.3 env: global: - - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0" + - PUPPET_GEM_VERSION="~> 6.0" matrix: fast_finish: true include: diff --git a/spec/lib/puppet_spec/compiler.rb b/spec/lib/puppet_spec/compiler.rb index 89c97a5..fb04a7b 100644 --- a/spec/lib/puppet_spec/compiler.rb +++ b/spec/lib/puppet_spec/compiler.rb @@ -29,12 +29,19 @@ module PuppetSpec::Compiler end def apply_compiled_manifest(manifest, prioritizer = Puppet::Graph::SequentialPrioritizer.new) + args = [] + if Puppet.version.to_f < 5.0 + args << 'apply' + # rubocop:disable RSpec/AnyInstance + Puppet::Transaction::Persistence.any_instance.stubs(:save) + # rubocop:enable RSpec/AnyInstance + end catalog = compile_to_ral(manifest) if block_given? catalog.resources.each { |res| yield res } end transaction = Puppet::Transaction.new(catalog, - Puppet::Transaction::Report.new, + Puppet::Transaction::Report.new(*args), prioritizer) transaction.evaluate transaction.report.finalize_report diff --git a/spec/unit/provider/cron/parsed_spec.rb b/spec/unit/provider/cron/parsed_spec.rb index d913eef..d54129c 100644 --- a/spec/unit/provider/cron/parsed_spec.rb +++ b/spec/unit/provider/cron/parsed_spec.rb @@ -195,10 +195,14 @@ describe Puppet::Type.type(:cron).provider(:crontab) do end it 'contains no resources for a user who has no crontab, or for a user that is absent' do - Puppet::Util::Execution - .expects(:execute) - .with('crontab -u foobar -l', failonfail: true, combine: true) - .returns('') + if Puppet.version.to_f < 5.0 + described_class.target_object('foobar').expects(:`).with('crontab -u foobar -l 2>/dev/null').returns '' + else + Puppet::Util::Execution + .expects(:execute) + .with('crontab -u foobar -l', failonfail: true, combine: true) + .returns('') + end expect(described_class.instances.select do |resource| resource.get('target') == 'foobar' end).to be_empty |