Merge pull request #851 from puppetlabs/pdksync_pdksync_heads/master-…

…0-gb096033 pdksync - pdksync_heads/master-0-gb096033
puppetlabs · Jul 16, 2019 · ed865a9 · ed865a9
2 parents 5c63dac + 384060a
commit ed865a9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -1,4 +1,5 @@
 ---
+dist: xenial
 language: ruby
 cache: bundler
 before_install:

diff --git 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
@@ -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
@@ -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