From: Raphaël Pinson <raphael.pinson@camptocamp.com>
Date: Tue, 25 Nov 2014 16:43:58 +0000 (+0100)
Subject: Fix future parser tests
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9364de72c4bfac0e181dfd40f16a36b1249b156b;p=puppet-dhcp.git

Fix future parser tests
---

diff --git a/Gemfile b/Gemfile
index 3928d5a..fa8cc38 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, :git => 'https://github.com/rodjek/rspec-puppet.git'
+  gem 'rspec-puppet',            :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'future-no-import'
   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 98b22c3..0b4bc99 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,7 +19,7 @@ RSpec.configure do |c|
     end
 
     if ENV['PUPPET_PARSER'] == 'future'
-      Puppet.settings[:parser]='future'
+      c.parser='future'
     end
   end