diff options
| -rw-r--r-- | lib/puppet/parser/functions/require.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/parser/functions/require.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/parser/functions/require.rb b/lib/puppet/parser/functions/require.rb index f634f9fbd..66d60b9ce 100644 --- a/lib/puppet/parser/functions/require.rb +++ b/lib/puppet/parser/functions/require.rb @@ -39,7 +39,7 @@ fail if used with earlier clients. vals.each do |klass| # lookup the class in the scopes if classobj = find_hostclass(klass) - klass = classobj.classname + klass = classobj.name else raise Puppet::ParseError, "Could not find class %s" % klass end diff --git a/spec/unit/parser/functions/require.rb b/spec/unit/parser/functions/require.rb index 4e05069df..924990a5d 100755 --- a/spec/unit/parser/functions/require.rb +++ b/spec/unit/parser/functions/require.rb @@ -13,7 +13,7 @@ describe "the require function" do @scope.stubs(:resource).returns @resource @scope.stubs(:findresource) @scope.stubs(:compiler).returns(@compiler) - @klass = stub 'class', :classname => "myclass" + @klass = stub 'class', :name => "myclass" @scope.stubs(:find_hostclass).returns(@klass) end @@ -52,7 +52,7 @@ describe "the require function" do @scope.stubs(:function_include) @scope.expects(:find_hostclass).with("myclass").returns(@klass) - @klass.expects(:classname).returns("myclass") + @klass.expects(:name).returns("myclass") @scope.function_require("myclass") end |