Skip to content

Commit 985cee4

Browse files
author
carabasdaniel
authored
Merge pull request puppetlabs#102 from puppetlabs/pdksync_pdksync_heads/master-0-gb096033
pdksync - pdksync_heads/master-0-gb096033
2 parents 8c746f7 + a54601f commit 985cee4

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GetText:
2626
GetText/DecorateString:
2727
Description: We don't want to decorate test output.
2828
Exclude:
29-
- spec/*
29+
- spec/**/*
3030
RSpec/BeforeAfterAll:
3131
Description: Beware of using after(:all) as it may cause state to leak between tests.
3232
A necessary evil in acceptance testing.

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
dist: xenial
23
language: ruby
34
cache: bundler
45
before_install:

Rakefile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
12
require 'puppetlabs_spec_helper/rake_tasks'
23
require 'puppet-syntax/tasks/puppet-syntax'
34
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?

metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
}
6868
],
6969
"description": "Tasks that manipulate a service",
70-
"pdk-version": "1.10.0",
70+
"pdk-version": "1.11.1",
7171
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
72-
"template-ref": "heads/master-0-g7827fc2"
72+
"template-ref": "heads/master-0-gb096033"
7373
}

spec/spec_helper.rb

+5
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
end
3030
end
3131

32+
# read default_facts and merge them over what is provided by facterdb
33+
default_facts.each do |fact, value|
34+
add_custom_fact fact, value
35+
end
36+
3237
RSpec.configure do |c|
3338
c.default_facts = default_facts
3439
c.before :each do

0 commit comments

Comments
 (0)