Merge branch '0.25.x'

Conflicts:
	lib/puppet/agent.rb
	lib/puppet/application/puppetd.rb
	lib/puppet/parser/ast/leaf.rb
	lib/puppet/util/rdoc/parser.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/unit/parser/functions/require.rb b/spec/unit/parser/functions/require.rb
index 24c9ecc64..577a52a42 100755
--- a/spec/unit/parser/functions/require.rb
+++ b/spec/unit/parser/functions/require.rb
@@ -31,6 +31,12 @@ describe "the require function" do
         @scope.function_require("myclass")
     end
 
+    it "should verify the 'include' function is loaded" do
+        Puppet::Parser::Functions.expects(:function).with(:include).returns(:function_include)
+        @scope.stubs(:function_include)
+        @scope.function_require("myclass")
+    end
+
     it "should include the class but not add a dependency if used on a client not at least version 0.25" do
         @resource.expects(:metaparam_compatibility_mode?).returns true
         @scope.expects(:warning)