Fix future parser tests

diff --git a/Gemfile b/Gemfile
index 3928d5afb0b92ead240fdf0ff9b406942c7b06b9..fa8cc38875517701c5bf67d8ea3cf2ec1bb160d5 100644 (file)
--- 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 98b22c3d8b87f4b03a8e877ec045df71137b3ad0..0b4bc99dba162e2b0c2774b57ae9736879fa0581 100644 (file)
--- 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