Fixing the rest of #948. My previous work was sufficient,

except that I was not passing the interpolated value in
to the hook, which meant the libdir was set to something
like $vardir/lib.

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/unit/util/settings.rb b/spec/unit/util/settings.rb
index ab93d87de..5a0333798 100755
--- a/spec/unit/util/settings.rb
+++ b/spec/unit/util/settings.rb
@@ -382,6 +382,20 @@ describe Puppet::Util::Settings, " when parsing its configuration" do
         values.should == ["other"]
     end
 
+    it "should pass the interpolated value to the hook when one is available" do
+        values = []
+        @settings.setdefaults :section, :base => {:default => "yay", :desc => "a", :hook => proc { |v| values << v }}
+        @settings.setdefaults :section, :mysetting => {:default => "defval", :desc => "a", :hook => proc { |v| values << v }}
+
+        text = "[main]
+        mysetting = $base/setval
+        "
+        file = "/some/file"
+        @settings.expects(:read_file).with(file).returns(text)
+        @settings.parse(file)
+        values.should == ["yay/setval"]
+    end
+
     it "should allow empty values" do
         @settings.setdefaults :section, :myarg => ["myfile", "a"]