summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/transportable.rb1
-rwxr-xr-xspec/unit/other/transobject.rb8
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/puppet/transportable.rb b/lib/puppet/transportable.rb
index d203b5928..41c51fde6 100644
--- a/lib/puppet/transportable.rb
+++ b/lib/puppet/transportable.rb
@@ -53,6 +53,7 @@ module Puppet
Puppet.debug "Defining %s on %s" % [param, ref]
trans[param] = value
}
+ trans.catalog = self.catalog
Puppet::Type::Component.create(trans)
end
diff --git a/spec/unit/other/transobject.rb b/spec/unit/other/transobject.rb
index 07ffdf8bd..33de72c74 100755
--- a/spec/unit/other/transobject.rb
+++ b/spec/unit/other/transobject.rb
@@ -77,9 +77,15 @@ describe Puppet::TransObject, " when converting to a RAL component instance" do
@resource.to_component.should == :yay
end
+ it "should copy over the catalog" do
+ @resource.catalog = "mycat"
+ Puppet::Type::Component.expects(:create).with { |resource| resource.catalog == "mycat" }.returns(:yay)
+ @resource.to_component
+ end
+
# LAK:FIXME This really isn't the design we want going forward, but it's
# good enough for now.
- it "should not pass resource paramaters that are not metaparams" do
+ it "should not pass resource parameters that are not metaparams" do
Puppet::Type::Component.expects(:create).with { |resource| resource["one"].nil? }.returns(:yay)
@resource.to_component.should == :yay
end