Merge pull request #31 from rnelson0/modulesync

Remove puppet 3 testing, add puppet 5 testing
rnelson0 · Jul 1, 2017 · d1aa17a · d1aa17a
2 parents 7df9155 + 86b8142
commit d1aa17a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
diff --git 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',