diff options
| author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 15:22:13 -0700 |
|---|---|---|
| committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 15:22:13 -0700 |
| commit | 659704831ee9a4d3c83410010884405bdfde7e89 (patch) | |
| tree | 0f9ba027b4f363b23ac3178120b40db567619ec8 /spec/unit/puppet/parser/functions/validate_re_spec.rb | |
| parent | 15e13fb6b93347003aa3d3666baf531be0472418 (diff) | |
| parent | cdd45298337df80aad757e81eb7457317219c1b7 (diff) | |
| download | puppet-stdlib-659704831ee9a4d3c83410010884405bdfde7e89.tar.gz puppet-stdlib-659704831ee9a4d3c83410010884405bdfde7e89.tar.bz2 | |
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
Diffstat (limited to 'spec/unit/puppet/parser/functions/validate_re_spec.rb')
| -rw-r--r-- | spec/unit/puppet/parser/functions/validate_re_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |