diff options
| -rw-r--r-- | lib/puppet/parser/functions/tfile.rb | 2 | ||||
| -rw-r--r-- | spec/unit/parser/functions/tfile.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/tfile.rb b/lib/puppet/parser/functions/tfile.rb index 2e792f9..a984892 100644 --- 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 e64170a..1cc37d4 100644 --- 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" |