Merge branch 'template-not-defined-test-failure'

* template-not-defined-test-failure:
  Clean up indentation, whitespace, and commented out code
  Remove order dependency from functions integration spec

1 files changed, 1 insertions, 1 deletions

diff --git a/spec/integration/parser/functions_spec.rb b/spec/integration/parser/functions_spec.rb
index 6791987d7..6a8fbca9c 100755
--- a/spec/integration/parser/functions_spec.rb
+++ b/spec/integration/parser/functions_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Puppet::Parser::Functions do
   before :each do
-    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.function("template")
+    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.functions.include?("template")
   end
 
   it "should support multiple threads autoloading the same function" do