rather directly read the file than use the puppet function

diff --git a/lib/puppet/parser/functions/tfile.rb b/lib/puppet/parser/functions/tfile.rb
index 2e792f90174b4d4f2612ea0c54eabcafd9ddb379..a984892f29c0843367a619d6d017e7b0333d1e67 100644 (file)
--- a/lib/puppet/parser/functions/tfile.rb
+++ b/lib/puppet/parser/functions/tfile.rb
@@ -14,5 +14,5 @@ Puppet::Parser::Functions::newfunction(
     require 'fileutils'
     FileUtils.touch(path)
   end
-  function_file([path])
+  File.read(path)
 end

diff --git a/spec/unit/parser/functions/tfile.rb b/spec/unit/parser/functions/tfile.rb
index e64170a314f609e2bc6e5e3c50a080d6ee2e069b..1cc37d4b07e442df4b3ba5554e93f36023d1855d 100644 (file)
--- a/spec/unit/parser/functions/tfile.rb
+++ b/spec/unit/parser/functions/tfile.rb
@@ -24,10 +24,10 @@ describe "the tfile function" do
   describe "when executed properly" do
 
     before :each do
-       Puppet::Parser::Scope.any_instance.stubs(:function_file).with(['/some_path/aa']).returns("foo1\nfoo2\n")
+       File.stubs(:read).with('/some_path/aa').returns("foo1\nfoo2\n")
     end
 
-    it "should return the content of the file by calling the puppet file function" do
+    it "should return the content of the file" do
       File.stubs(:exists?).with('/some_path/aa').returns(true)
       result = @scope.function_tfile(['/some_path/aa'])
       result.should == "foo1\nfoo2\n"