From 384060a6173a66f506bbb7fe6104886f545d5ff2 Mon Sep 17 00:00:00 2001 From: lionce Date: Tue, 16 Jul 2019 10:04:23 +0300 Subject: [PATCH] pdksync_heads/master-0-gb096033 --- .rubocop.yml | 2 +- .travis.yml | 1 + Rakefile | 1 + metadata.json | 4 ++-- spec/spec_helper.rb | 5 +++++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index b46c85991..3cd2b0e5a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -26,7 +26,7 @@ GetText: GetText/DecorateString: Description: We don't want to decorate test output. Exclude: - - spec/* + - spec/**/* RSpec/BeforeAfterAll: Description: Beware of using after(:all) as it may cause state to leak between tests. A necessary evil in acceptance testing. diff --git a/.travis.yml b/.travis.yml index bf22cd04c..b6064dd0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ --- +dist: xenial language: ruby cache: bundler before_install: diff --git a/Rakefile b/Rakefile index 597f494c2..d9b223c62 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,4 @@ +require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any? require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-syntax/tasks/puppet-syntax' require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any? diff --git a/metadata.json b/metadata.json index ace157f1f..6365c340f 100644 --- a/metadata.json +++ b/metadata.json @@ -76,6 +76,6 @@ } ], "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-g7827fc2", - "pdk-version": "1.10.0" + "template-ref": "heads/master-0-gb096033", + "pdk-version": "1.11.1" } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9ee437370..c09e0024d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -29,6 +29,11 @@ end end +# read default_facts and merge them over what is provided by facterdb +default_facts.each do |fact, value| + add_custom_fact fact, value +end + RSpec.configure do |c| c.default_facts = default_facts c.before :each do