diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:59:52 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:59:52 -0700 |
commit | 243c7c2a499697654101af726f1f47d367e41c13 (patch) | |
tree | 855d07f105866afbb26f5e093997a7d5f295e408 /spec/unit/puppet/parser/functions/validate_slength_spec.rb | |
parent | cc414a422de0d773a1012ca57f41f15b4d6caf06 (diff) | |
parent | effdfb845092fbe549c286926ac686aab1746a12 (diff) |
Merge branch '2.3.x'
* 2.3.x:
(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
Conflicts:
spec/spec_helper.rb
spec/unit/puppet/parser/functions/get_module_path_spec.rb
Diffstat (limited to 'spec/unit/puppet/parser/functions/validate_slength_spec.rb')
-rwxr-xr-x | spec/unit/puppet/parser/functions/validate_slength_spec.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/unit/puppet/parser/functions/validate_slength_spec.rb b/spec/unit/puppet/parser/functions/validate_slength_spec.rb index d2d4ca0..eccf908 100755 --- a/spec/unit/puppet/parser/functions/validate_slength_spec.rb +++ b/spec/unit/puppet/parser/functions/validate_slength_spec.rb @@ -1,13 +1,9 @@ -#!/usr/bin/env rspec +#! /usr/bin/env ruby -S rspec require 'spec_helper' describe "the validate_slength function" do - before :all do - Puppet::Parser::Functions.autoloader.loadall - end - - let(:scope) { Puppet::Parser::Scope.new } + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } it "should exist" do Puppet::Parser::Functions.function("validate_slength").should == "function_validate_slength" |