diff options
author | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 14:52:08 -0700 |
---|---|---|
committer | Patrick Carlisle <patrick@puppetlabs.com> | 2012-08-09 14:52:08 -0700 |
commit | cdd45298337df80aad757e81eb7457317219c1b7 (patch) | |
tree | 4132ab281a3064b892c4a59ffc99a2a2645a1bbd /spec/unit/puppet/parser/functions/validate_re_spec.rb | |
parent | c101da0b83210fe4c1603f3d7a014f72c988f5ac (diff) | |
parent | 424b56da616041e365cb471dafc05a3d7ade4e45 (diff) | |
download | puppet-stdlib-cdd45298337df80aad757e81eb7457317219c1b7.tar.gz puppet-stdlib-cdd45298337df80aad757e81eb7457317219c1b7.tar.bz2 |
Merge branch '2.3.x' into 2.4.x
* 2.3.x:
Make sure functions are loaded for each test
Use rvalue functions correctly
(Maint) Don't mock with mocha
(Maint) Fix up the get_module_path parser function
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
(Maint) Fix interpreter lines
Update CHANGELOG, Modulefile for 2.3.3
fix regression in #11017 properly
Fix spec tests using the new spec_helper
Update CHANGELOG for 2.3.2 release
Make file_line default to ensure => present
Memoize file_line spec instance variables
Fix spec tests using the new spec_helper
Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x"
(#13595) initialize_everything_for_tests couples modules Puppet ver
Diffstat (limited to 'spec/unit/puppet/parser/functions/validate_re_spec.rb')
-rw-r--r-- | spec/unit/puppet/parser/functions/validate_re_spec.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/spec/unit/puppet/parser/functions/validate_re_spec.rb b/spec/unit/puppet/parser/functions/validate_re_spec.rb index c35ae14..d189efb 100644 --- a/spec/unit/puppet/parser/functions/validate_re_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_re_spec.rb @@ -1,17 +1,13 @@ require 'spec_helper' describe Puppet::Parser::Functions.function(:validate_re) do - before :all do - Puppet::Parser::Functions.autoloader.loadall - end - - let(:scope) do - scope = Puppet::Parser::Scope.new - end + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } # 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 |