Merge branch '2.4.x'

* 2.4.x:
  Make sure functions are loaded for each test
  Use rvalue functions correctly
  (#2157) Make facts_dot_d compatible with external facts

Conflicts:
	lib/facter/facter_dot_d.rb

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
index 9d66fcb..08aaf78 100644
--- a/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_absolute_path_spec.rb
@@ -3,8 +3,12 @@ require 'spec_helper'
 describe Puppet::Parser::Functions.function(:validate_absolute_path) do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
-  # The subject of these examplres is the method itself.
-  subject() { scope.method(:function_validate_absolute_path) }
+  # The subject of these examples is the method itself.
+  subject do
+    # This makes sure the function is loaded within each test
+    function_name = Puppet::Parser::Functions.function(:validate_absolute_path)
+    scope.method(function_name)
+  end
 
   describe "Valid Paths" do
     def self.valid_paths