diff options
author | Luke Kanies <luke@reductivelabs.com> | 2010-03-16 08:17:49 -0700 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | bc90df6e7c0ea194f46ecc3c1753226b8da648c8 (patch) | |
tree | 5f68fde4f1f9bb39897da0e480b41ebfed31d441 /spec/unit/parser | |
parent | 17e40e745157b538d19800618584d19f8d29226e (diff) | |
download | puppet-bc90df6e7c0ea194f46ecc3c1753226b8da648c8.tar.gz puppet-bc90df6e7c0ea194f46ecc3c1753226b8da648c8.tar.xz puppet-bc90df6e7c0ea194f46ecc3c1753226b8da648c8.zip |
Functions are added to a module instead of Scope
We were previously adding them directly to Scope, but
now they're in a module that Scope includes.
This is the first half of #1175 - we can now maintain
environment-specific collections of functions. We need
some way of tracking which environment a given function
is loaded from.
Well, maybe it's the first third - the core functions
probably need to be added to all of these modules,
or there needs to be a 'common' module that is included by
all of them.
Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'spec/unit/parser')
-rw-r--r-- | spec/unit/parser/functions.rb | 41 | ||||
-rwxr-xr-x | spec/unit/parser/scope.rb | 18 |
2 files changed, 48 insertions, 11 deletions
diff --git a/spec/unit/parser/functions.rb b/spec/unit/parser/functions.rb index fe449139d..f605052b5 100644 --- a/spec/unit/parser/functions.rb +++ b/spec/unit/parser/functions.rb @@ -4,9 +4,6 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Puppet::Parser::Functions do - before(:each) do - end - after(:each) do # Rationale: # our various tests will almost all register to Pupet::Parser::Functions @@ -23,33 +20,51 @@ describe Puppet::Parser::Functions do end end + it "should have a method for returning an environment-specific module" do + Puppet::Parser::Functions.environment_module("myenv").should be_instance_of(Module) + end + + it "should use the current default environment if no environment is provided" do + Puppet::Parser::Functions.environment_module().should be_instance_of(Module) + end + describe "when calling newfunction" do - it "should create the function in the scope class" do - Puppet::Parser::Scope.expects(:define_method).with { |name,block| name == "function_name" } + before do + @module = Module.new + Puppet::Parser::Functions.stubs(:environment_module).returns @module + end + + it "should create the function in the environment module" do + @module.expects(:define_method).with { |name,block| name == "function_name" } Puppet::Parser::Functions.newfunction("name", :type => :rvalue) end it "should raise an error if the function already exists" do - Puppet::Parser::Scope.expects(:define_method).with { |name,block| name == "function_name" }.once + @module.expects(:define_method).with { |name,block| name == "function_name" }.once Puppet::Parser::Functions.newfunction("name", :type => :rvalue) lambda { Puppet::Parser::Functions.newfunction("name", :type => :rvalue) }.should raise_error end it "should raise an error if the function type is not correct" do - Puppet::Parser::Scope.expects(:define_method).with { |name,block| name == "function_name" }.never + @module.expects(:define_method).with { |name,block| name == "function_name" }.never lambda { Puppet::Parser::Functions.newfunction("name", :type => :unknown) }.should raise_error end end describe "when calling rmfunction" do + before do + @module = Module.new + Puppet::Parser::Functions.stubs(:environment_module).returns @module + end + it "should remove the function in the scope class" do - Puppet::Parser::Scope.expects(:define_method).with { |name,block| name == "function_name" } + @module.expects(:define_method).with { |name,block| name == "function_name" } Puppet::Parser::Functions.newfunction("name", :type => :rvalue) - Puppet::Parser::Scope.expects(:remove_method).with("function_name").once + @module.expects(:remove_method).with("function_name").once Puppet::Parser::Functions.rmfunction("name") end @@ -60,6 +75,10 @@ describe Puppet::Parser::Functions do end describe "when calling function to test function existance" do + before do + @module = Module.new + Puppet::Parser::Functions.stubs(:environment_module).returns @module + end it "should return false if the function doesn't exist" do Puppet::Parser::Functions.autoloader.stubs(:load) @@ -67,8 +86,8 @@ describe Puppet::Parser::Functions do Puppet::Parser::Functions.function("name").should be_false end - it "should return it's name if the function exists" do - Puppet::Parser::Scope.expects(:define_method).with { |name,block| name == "function_name" } + it "should return its name if the function exists" do + @module.expects(:define_method).with { |name,block| name == "function_name" } Puppet::Parser::Functions.newfunction("name", :type => :rvalue) Puppet::Parser::Functions.function("name").should == "function_name" diff --git a/spec/unit/parser/scope.rb b/spec/unit/parser/scope.rb index c030f2552..7093279b6 100755 --- a/spec/unit/parser/scope.rb +++ b/spec/unit/parser/scope.rb @@ -58,6 +58,24 @@ describe Puppet::Parser::Scope do Puppet::Parser::Scope.ancestors.should include(Puppet::Resource::TypeCollectionHelper) end + describe "when initializing" do + it "should extend itself with its environment's Functions module" do + env = Puppet::Node::Environment.new("myenv") + compiler = stub 'compiler', :environment => env + mod = Module.new + Puppet::Parser::Functions.expects(:environment_module).with(env).returns mod + + Puppet::Parser::Scope.new(:compiler => compiler).metaclass.ancestors.should be_include(mod) + end + + it "should extend itself with the default Functions module if it has no environment" do + mod = Module.new + Puppet::Parser::Functions.expects(:environment_module).with(nil).returns mod + + Puppet::Parser::Scope.new().metaclass.ancestors.should be_include(mod) + end + end + describe "when looking up a variable" do it "should default to an empty string" do @scope.lookupvar("var").should == "" |