Finishing renaming :params to :parameters internally

I had only done this partway, because it seemed easier,
but not surprisingly, it ended up being more complex.

In addition to those renames, this commit includes fixes
to whatever tests I needed to fix to confirm that things
were again working.  I think most of these broken
tests have been broken for a while.

Signed-off-by: Luke Kanies <luke@reductivelabs.com>

5 files changed, 43 insertions, 21 deletions

diff --git a/spec/unit/parser/ast/resource.rb b/spec/unit/parser/ast/resource.rb
index 40074c7ca..2473fda25 100755
--- a/spec/unit/parser/ast/resource.rb
+++ b/spec/unit/parser/ast/resource.rb
@@ -10,14 +10,14 @@ describe Puppet::Parser::AST::Resource do
         @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
         @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
         @scope.stubs(:resource).returns(stub_everything)
-        @resource = ast::Resource.new(:title => @title, :type => "file", :params => ast::ASTArray.new(:children => []) )
+        @resource = ast::Resource.new(:title => @title, :type => "file", :parameters => ast::ASTArray.new(:children => []) )
         @resource.stubs(:qualified_type).returns("Resource")
     end
 
     it "should evaluate all its parameters" do
         param = stub 'param'
         param.expects(:safeevaluate).with(@scope).returns Puppet::Parser::Resource::Param.new(:name => "myparam", :value => "myvalue", :source => stub("source"))
-        @resource.stubs(:params).returns [param]
+        @resource.stubs(:parameters).returns [param]
 
         @resource.evaluate(@scope)
     end
@@ -98,7 +98,7 @@ describe Puppet::Parser::AST::Resource do
 
         def resource(type, params = nil)
             params ||= Puppet::Parser::AST::ASTArray.new(:children => [])
-            Puppet::Parser::AST::Resource.new(:type => type, :title => Puppet::Parser::AST::String.new(:value => "myresource"), :params => params)
+            Puppet::Parser::AST::Resource.new(:type => type, :title => Puppet::Parser::AST::String.new(:value => "myresource"), :parameters => params)
         end
 
         it "should be able to generate resources with fully qualified type information" do
diff --git a/spec/unit/parser/ast/resource_defaults.rb b/spec/unit/parser/ast/resource_defaults.rb
new file mode 100755
index 000000000..b2cec31c6
--- /dev/null
+++ b/spec/unit/parser/ast/resource_defaults.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Puppet::Parser::AST::ResourceDefaults do
+
+    ast = Puppet::Parser::AST
+
+    before :each do
+        @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
+        @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
+        @params = Puppet::Parser::AST::ASTArray.new({})
+        @compiler.stubs(:add_override)
+    end
+
+    it "should add defaults when evaluated" do
+        default = Puppet::Parser::AST::ResourceDefaults.new :type => "file", :parameters => Puppet::Parser::AST::ASTArray.new(:children => [])
+        default.evaluate @scope
+
+        @scope.lookupdefaults("file").should_not be_nil
+    end
+end
diff --git a/spec/unit/parser/ast/resource_override.rb b/spec/unit/parser/ast/resource_override.rb
index 2735757d4..d327b57cd 100755
--- a/spec/unit/parser/ast/resource_override.rb
+++ b/spec/unit/parser/ast/resource_override.rb
@@ -7,7 +7,7 @@ describe Puppet::Parser::AST::ResourceOverride do
     ast = Puppet::Parser::AST
 
     before :each do
-        @compiler = stub 'compiler'
+        @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
         @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
         @params = ast::ASTArray.new({})
         @compiler.stubs(:add_override)
@@ -17,7 +17,7 @@ describe Puppet::Parser::AST::ResourceOverride do
         klass = stub 'klass', :title => "title", :type => "type"
         object = mock 'object'
         object.expects(:safeevaluate).with(@scope).returns(klass)
-        ast::ResourceOverride.new(:object => object, :params => @params ).evaluate(@scope)
+        ast::ResourceOverride.new(:object => object, :parameters => @params ).evaluate(@scope)
     end
 
     it "should tell the compiler to override the resource with our own" do
@@ -25,13 +25,13 @@ describe Puppet::Parser::AST::ResourceOverride do
 
         klass = stub 'klass', :title => "title", :type => "one"
         object = mock 'object', :safeevaluate => klass
-        ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope)
+        ast::ResourceOverride.new(:object => object , :parameters => @params).evaluate(@scope)
     end
 
     it "should return the overriden resource directly when called with one item" do
         klass = stub 'klass', :title => "title", :type => "one"
         object = mock 'object', :safeevaluate => klass
-        override = ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope)
+        override = ast::ResourceOverride.new(:object => object , :parameters => @params).evaluate(@scope)
         override.should be_an_instance_of(Puppet::Parser::Resource)
         override.title.should == "title"
         override.type.should == "One"
@@ -43,7 +43,7 @@ describe Puppet::Parser::AST::ResourceOverride do
 
         object = mock 'object', :safeevaluate => [klass1,klass2]
 
-        override = ast::ResourceOverride.new(:object => object , :params => @params).evaluate(@scope)
+        override = ast::ResourceOverride.new(:object => object , :parameters => @params).evaluate(@scope)
         override.should have(2).elements
         override.each {|o| o.should be_an_instance_of(Puppet::Parser::Resource) }
     end
diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb
index 78d47c63f..42da3ff9e 100755
--- a/spec/unit/parser/collector.rb
+++ b/spec/unit/parser/collector.rb
@@ -42,7 +42,7 @@ describe Puppet::Parser::Collector, "when initializing" do
 
     it "should accept an optional resource override" do
         @collector = Puppet::Parser::Collector.new(@scope, "resource::type", @equery, @vquery, @form)
-        override = { :params => "whatever" }
+        override = { :parameters => "whatever" }
         @collector.add_override(override)
         @collector.overrides.should equal(override)
     end
@@ -181,9 +181,9 @@ describe Puppet::Parser::Collector, "when collecting virtual and catalog resourc
 
         @compiler.expects(:resources).returns([one])
 
-        @collector.add_override(:params => param )
+        @collector.add_override(:parameters => param )
         Puppet::Parser::Resource.expects(:new).with { |type, title, h|
-            h[:params] == param
+            h[:parameters] == param
         }
 
         @collector.evaluate
@@ -197,7 +197,7 @@ describe Puppet::Parser::Collector, "when collecting virtual and catalog resourc
 
         @compiler.expects(:resources).returns([one])
 
-        @collector.add_override(:params => param, :source => source )
+        @collector.add_override(:parameters => param, :source => source )
         Puppet::Parser::Resource.stubs(:new)
 
         source.expects(:meta_def).with { |name,block| name == :child_of? }
@@ -213,9 +213,9 @@ describe Puppet::Parser::Collector, "when collecting virtual and catalog resourc
 
         @compiler.expects(:resources).at_least(2).returns([one])
 
-        @collector.add_override(:params => param )
+        @collector.add_override(:parameters => param )
         Puppet::Parser::Resource.expects(:new).once.with { |type, title, h|
-            h[:params] == param
+            h[:parameters] == param
         }
 
         @collector.evaluate
@@ -239,7 +239,7 @@ describe Puppet::Parser::Collector, "when collecting virtual and catalog resourc
 
         one.expects(:virtual=).with(false)
         @compiler.expects(:resources).returns([one])
-        @collector.add_override(:params => param )
+        @collector.add_override(:parameters => param )
         Puppet::Parser::Resource.stubs(:new).returns("whatever")
 
         @compiler.expects(:add_override).with("whatever")
@@ -266,14 +266,14 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do
     confine "Cannot test Rails integration without ActiveRecord" => Puppet.features.rails?
 
     before do
-        @scope = stub 'scope', :host => "myhost", :debug => nil
-        @compiler = mock 'compile'
-        @scope.stubs(:compiler).returns(@compiler)
+        @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("mynode"))
+        @scope = Puppet::Parser::Scope.new :compiler => @compiler
         @resource_type = "Mytype"
         @equery = "test = true"
         @vquery = proc { |r| true }
 
         Puppet.settings.stubs(:value).with(:storeconfigs).returns true
+        Puppet.settings.stubs(:value).with(:environment).returns "production"
 
         @collector = Puppet::Parser::Collector.new(@scope, @resource_type, @equery, @vquery, :exported)
     end
@@ -374,9 +374,9 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do
         @compiler.stubs(:add_override)
         @compiler.stubs(:add_resource)
 
-        @collector.add_override(:params => param )
+        @collector.add_override(:parameters => param )
         Puppet::Parser::Resource.expects(:new).once.with { |type, title, h|
-            h[:params] == param
+            h[:parameters] == param
         }
 
         @collector.evaluate
diff --git a/spec/unit/parser/parser.rb b/spec/unit/parser/parser.rb
index 8cc29c9b8..909a73c98 100755
--- a/spec/unit/parser/parser.rb
+++ b/spec/unit/parser/parser.rb
@@ -154,7 +154,7 @@ describe Puppet::Parser do
 
         it "should create an ast::ResourceOverride" do
             ast::ResourceOverride.expects(:new).with { |arg|
-                arg[:line]==1 and arg[:object].is_a?(ast::ResourceReference) and arg[:params].is_a?(ast::ResourceParam)
+                arg[:line]==1 and arg[:object].is_a?(ast::ResourceReference) and arg[:parameters].is_a?(ast::ResourceParam)
             }
             @parser.parse('Resource["title1","title2"] { param => value }')
         end