summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2014-11-25 17:43:49 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2014-11-25 17:43:49 +0100
commit9f83121325b04c0f51e6e8b2846bbcdd4f1267c8 (patch)
tree56330655e18485840795b22211c6f01b43d6c80a
parentfe75c3cd416a10d5bc6fec0f64fe77a43d63ce0e (diff)
Fix future parser tests
-rw-r--r--Gemfile2
-rw-r--r--spec/spec_helper.rb2
2 files changed, 2 insertions, 2 deletions
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