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/getvar_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/getvar_spec.rb')
-rw-r--r-- | spec/unit/puppet/parser/functions/getvar_spec.rb | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/spec/unit/puppet/parser/functions/getvar_spec.rb b/spec/unit/puppet/parser/functions/getvar_spec.rb index 16edd98..62ad192 100644 --- a/spec/unit/puppet/parser/functions/getvar_spec.rb +++ b/spec/unit/puppet/parser/functions/getvar_spec.rb @@ -1,36 +1,17 @@ -require 'puppet' +#! /usr/bin/env ruby -S rspec +require 'spec_helper' -# We don't need this for the basic tests we're doing -# require 'spec_helper' - -# Dan mentioned that Nick recommended the function method call -# to return the string value for the test description. -# this will not even try the test if the function cannot be -# loaded. describe Puppet::Parser::Functions.function(:getvar) do - - # Pulled from Dan's create_resources function - def get_scope - @topscope = Puppet::Parser::Scope.new - # This is necessary so we don't try to use the compiler to discover our parent. - @topscope.parent = nil - @scope = Puppet::Parser::Scope.new - @scope.compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("floppy", :environment => 'production')) - @scope.parent = @topscope - @compiler = @scope.compiler - end - + let(:scope) { PuppetlabsSpec::PuppetInternals.scope } describe 'when calling getvar from puppet' do it "should not compile when no arguments are passed" do Puppet[:code] = 'getvar()' - get_scope - expect { @scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) + expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end it "should not compile when too many arguments are passed" do Puppet[:code] = 'getvar("foo::bar", "baz")' - get_scope - expect { @scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) + expect { scope.compiler.compile }.should raise_error(Puppet::ParseError, /wrong number of arguments/) end it "should lookup variables in other namespaces" do @@ -43,11 +24,7 @@ describe Puppet::Parser::Functions.function(:getvar) do fail('getvar did not return what we expect') } ENDofPUPPETcode - get_scope - @scope.compiler.compile + scope.compiler.compile end - end - end - |