From 5f98c350fd264d9b2b3ada4d03fc450650727aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Tue, 25 Nov 2014 14:21:40 +0100
Subject: [PATCH] Use parser=future
---
.travis.yml | 5 +++++
Gemfile | 2 +-
spec/spec_helper.rb | 4 ++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index e43a2a8..8f896f3 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 29ed93f..3928d5a 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 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
--
GitLab