From ae11e894d2e949f19e480ee589cac380b975414e Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Mon, 2 Jun 2014 09:40:56 -0400 Subject: [PATCH 1/2] Replace the formatter in the rspec SPEC_OPTS TravisCI does not seem to enable the 'n' formatter anymore, hence we use the documentation one. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a23a590..6d75de2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: ruby -script: "bundle exec rake test COV=y SPEC_OPTS='--format n --color --backtrace'" +script: "bundle exec rake test COV=y SPEC_OPTS='--format documentation --color --backtrace'" rvm: - 1.9.3 - 2.0.0 From e91fe40281207799a83ed7868ea7601e2067989f Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Mon, 2 Jun 2014 09:59:39 -0400 Subject: [PATCH 2/2] Force travis/spec to use RSPEC version 2.14.x Since our test are not rspec 3.0.0 ready, we need to force travis to use rspec version 2.14.x --- Gemfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 1432103d..df2c3cb7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,14 @@ source 'https://rubygems.org' gem 'puppetlabs_spec_helper' -gem 'puppet-lint' +gem 'puppet-lint', '~> 0.3.2' gem 'json' gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git' -gem 'rake' +# rspec-puppet fetch the latest rspec (3.0.0) +# this version is a bit incompat. with older specs... +# http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3 +gem 'rspec', '2.14.1' +gem 'rake', '10.1.1' gem 'puppet-syntax' if puppetversion = ENV['PUPPET_GEM_VERSION']