pdksync_heads/master-0-gb096033

diff --git a/.rubocop.yml b/.rubocop.yml
index b46c85991f0e56eb844279fecc179400c12d779b..3cd2b0e5a9770b6200f94ce58e8868cca049fd6f 100644 (file)
--- 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 bf22cd04ce4ce46a79709554891f9bbbcb878466..b6064dd0bc92fc60b03cf209d38409c4f2c8dcea 100644 (file)
--- 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 597f494c27fbe048a36d6b598805e5bdb68f1d23..d9b223c62a837547c1e819c7ea30ad3ef45a0ef7 100644 (file)
--- 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 ace157f1ffd6eaeda4d9e9b9f8c09d3120de971f..6365c340fda2a68b5c4613e3383fba7b64980546 100644 (file)
--- 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 9ee43737050ba5dbe18a16e4491cf6776834f3d5..c09e0024da88e5dc36642b80f75efdc9887a6065 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -29,6 +29,11 @@ default_fact_files.each do |f|
   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