From ef03e8c143028646c9f517babcc5f37746c9cbd6 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Sat, 1 Jul 2017 22:58:54 +0000 Subject: [PATCH 1/2] Remove puppet 3 testing, add puppet 5 testing --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f061c18..30b04c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,7 @@ script: bundle exec rake test matrix: fast_finish: true include: - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES=yes - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES=yes + - rvm: 2.4.1 + env: PUPPET_GEM_VERSION="~> 5.0" STRICT_VARIABLES=yes From 86b8142f26b284aaa4bde563e0a0cbdf40e95ee1 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Sat, 1 Jul 2017 23:11:11 +0000 Subject: [PATCH 2/2] Puppet 5 and latest puppetlabs_spec_helper is more stringent about catalog contents Add the httpd or nginx service as required. --- spec/defines/vhost_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb index 2fbe7bc..030c196 100644 --- a/spec/defines/vhost_spec.rb +++ b/spec/defines/vhost_spec.rb @@ -1,6 +1,10 @@ require 'spec_helper' describe 'certs::vhost' do + let (:pre_condition) { + "service {'httpd': ensure => running}" + } + let(:title) { 'www.example.com' } let(:params) do { @@ -38,6 +42,10 @@ end context 'with service => nginx' do + let (:pre_condition) { + "service {'nginx': ensure => running}" + } + let(:params) do { :source_path => 'puppet:///othermodule',