diff --git a/.travis.yml b/.travis.yml index e43a2a8f1d44f6283b44d3823e49a0ada80bac25..8f896f32979307a07f3080f6aa5917f1226d8f62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,11 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future" + allow_failures: + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 3.0" PUPPET_PARSER="future" notifications: email: false deploy: diff --git a/Gemfile b/Gemfile index 29ed93f914b95321f03b047603c3a4ccadae7ba5..3928d5afb0b92ead240fdf0ff9b406942c7b06b9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :test do gem 'rake', :require => false - gem 'rspec-puppet', :require => false + gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'metadata-json-lint', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index adbb1916ddee8e3b8130e3e74522f5974117779d..98b22c3d8b87f4b03a8e877ec045df71137b3ad0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,6 +17,10 @@ RSpec.configure do |c| if Gem::Version.new(`puppet --version`) >= Gem::Version.new('3.5') Puppet.settings[:strict_variables]=true end + + if ENV['PUPPET_PARSER'] == 'future' + Puppet.settings[:parser]='future' + end end c.after :each do