From: Patrick Carlisle <patrick@puppetlabs.com>
Date: Thu, 9 Aug 2012 21:33:10 +0000 (-0700)
Subject: Make sure functions are loaded for each test
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=424b56da616041e365cb471dafc05a3d7ade4e45;p=puppet-stdlib.git

Make sure functions are loaded for each test

The test_helper code in Puppet now resets function state between each test.
This patch fixes two spec files where the function was not actually loaded in
the tests, causing them to fail.
---

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
diff --git a/spec/unit/puppet/parser/functions/validate_re_spec.rb b/spec/unit/puppet/parser/functions/validate_re_spec.rb
index a07ad47..d189efb 100644
--- a/spec/unit/puppet/parser/functions/validate_re_spec.rb
+++ b/spec/unit/puppet/parser/functions/validate_re_spec.rb
@@ -5,7 +5,9 @@ describe Puppet::Parser::Functions.function(:validate_re) do
 
   # The subject of these examplres is the method itself.
   subject do
-    scope.method :function_validate_re
+    # This makes sure the function is loaded within each test
+    function_name = Puppet::Parser::Functions.function(:validate_re)
+    scope.method(function_name)
   end
 
   context 'Using Puppet::Parser::Scope.new' do