From 2247df4f6e828d6791a46cb12d4e2df2e0b98dce Mon Sep 17 00:00:00 2001 From: Branan Purvine-Riley Date: Tue, 29 May 2012 13:55:26 -0700 Subject: Update for new gem version of puppetlabs_spec_helper This updates the Rakefile and spec_helper to use the common versions available in the puppetlabs_spec_helper rubygem branch. This mostly just removes a bunch of duplicated code, but it also gives us more flexibility in how the module is tested in the future. --- spec/unit/puppet/parser/functions/get_module_path_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/unit/puppet/parser') diff --git a/spec/unit/puppet/parser/functions/get_module_path_spec.rb b/spec/unit/puppet/parser/functions/get_module_path_spec.rb index d8340f4..e304502 100644 --- a/spec/unit/puppet/parser/functions/get_module_path_spec.rb +++ b/spec/unit/puppet/parser/functions/get_module_path_spec.rb @@ -3,7 +3,7 @@ require 'puppet' require 'fileutils' require 'spec_helper' describe Puppet::Parser::Functions.function(:get_module_path) do - include PuppetSpec::Files + include PuppetlabsSpec::Files def get_scope(environment = 'production') scope = Puppet::Parser::Scope.new @@ -30,7 +30,7 @@ describe Puppet::Parser::Functions.function(:get_module_path) do get_scope.function_get_module_path(['foo']).should == foo_path end it 'should be able to find module paths from the environment' do - conf_file = tmpfile('conffile') + conf_file = tmpfilename('conffile') File.open(conf_file, 'w') do |fh| fh.write("[dansenvironment]\nmodulepath = #{modulepath}") end -- cgit v1.2.3