diff options
| author | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2014-11-25 14:22:14 +0100 |
|---|---|---|
| committer | Raphaël Pinson <raphael.pinson@camptocamp.com> | 2014-11-25 14:22:14 +0100 |
| commit | d684f54a0d80a81a5bcead91a3ecf2b6056b37f4 (patch) | |
| tree | fffe94e4f75ddeee9464ecfa7a73956263949a41 | |
| parent | d9add1890064bca782a24b7048c79f3ff0fb33f1 (diff) | |
Use parser=future
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index a9018e7..6c66f09 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: @@ -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 adbb191..98b22c3 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 |