lock version of puppet-rspec to 1.0.1 as version 2 has issues

voxpupuli · Feb 8, 2015 · ae796cb · ae796cb
1 parent cb1a956
commit ae796cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
+---
 language: ruby
-rvm:
-  - 1.9.3
-script: "rake spec"
-env:
-  - PUPPET_VERSION=3.4.2
+bundler_args: --without system_tests
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+matrix:
+  fast_finish: true
+  include:
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email:
     - merritt@krakowitzer.com
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ rspecversion = ENV.key?('RSPEC_VERSION') ? "= #{ENV['RSPEC_VERSION']}" : ['>= 2.
 gem 'rake'
 gem 'puppet-lint'
 gem 'rspec', rspecversion
-gem 'rspec-puppet'
+gem 'rspec-puppet', "1.0.1"
 gem 'puppetlabs_spec_helper'
 gem 'puppet', puppetversion
 gem 'puppet-blacksmith'