diff options
author | danielsdeleo <dan@opscode.com> | 2014-02-19 13:05:45 -0800 |
---|---|---|
committer | danielsdeleo <dan@opscode.com> | 2014-02-19 13:55:40 -0800 |
commit | 0f16336630b9e86508ed19874e1f4747f9e7ab40 (patch) | |
tree | c1ebc5456fc5df4b5487f0e0c7bcbd64b272f2fb | |
parent | 0f934585e469700b5463dd3ece44fd61f4ff5ca1 (diff) | |
download | chef-0f16336630b9e86508ed19874e1f4747f9e7ab40.tar.gz |
Remove default implementation of Recipe DSL interface
Depending on the inheritance tree, the default implementations could
incorrectly be preferred to the real ones.
-rw-r--r-- | lib/chef/dsl/recipe.rb | 14 | ||||
-rw-r--r-- | spec/unit/dsl/recipe_spec.rb | 70 |
2 files changed, 70 insertions, 14 deletions
diff --git a/lib/chef/dsl/recipe.rb b/lib/chef/dsl/recipe.rb index c64291decc..ebf19c7f23 100644 --- a/lib/chef/dsl/recipe.rb +++ b/lib/chef/dsl/recipe.rb @@ -31,20 +31,6 @@ class Chef include Chef::Mixin::ConvertToClassName - # Default +cookbook_name+ implementation, always returns "none". This - # should be overriden in including classes whenever a meaningful value - # can be provided. - def cookbook_name - "none" - end - - # Default +recipe_name+ implementation, always returns "none". This - # should be overridden in including classes whenever a meaningful value - # can be provided. - def recipe_name - "none" - end - def method_missing(method_symbol, *args, &block) # If we have a definition that matches, we want to use that instead. This should # let you do some really crazy over-riding of "native" types, if you really want diff --git a/spec/unit/dsl/recipe_spec.rb b/spec/unit/dsl/recipe_spec.rb new file mode 100644 index 0000000000..14ee30be44 --- /dev/null +++ b/spec/unit/dsl/recipe_spec.rb @@ -0,0 +1,70 @@ +# +# Author:: Daniel DeLeo (<dan@getchef.com>) +# Copyright:: Copyright (c) 2014 Chef Software, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require 'spec_helper' +require 'chef/dsl/recipe' + + +RecipeDSLExampleClass = Struct.new(:cookbook_name, :recipe_name) +class RecipeDSLExampleClass + include Chef::DSL::Recipe +end + +RecipeDSLBaseAPI = Struct.new(:cookbook_name, :recipe_name) +class RecipeDSLExampleSubclass < RecipeDSLBaseAPI + include Chef::DSL::Recipe +end + +# TODO: most of DSL::Recipe's implementation is tested in Chef::Recipe's tests, +# move those to here. +describe Chef::DSL::Recipe do + + let(:cookbook_name) { "example_cb" } + let(:recipe_name) { "example_recipe" } + + shared_examples_for "A Recipe DSL Implementation" do + + it "responds to cookbook_name" do + expect(recipe.cookbook_name).to eq(cookbook_name) + end + + it "responds to recipe_name" do + expect(recipe.recipe_name).to eq(recipe_name) + end + end + + context "when included in a class that defines the required interface directly" do + + let(:recipe) { RecipeDSLExampleClass.new(cookbook_name, recipe_name) } + + include_examples "A Recipe DSL Implementation" + + end + + # This is the situation that occurs when the Recipe DSL gets mixed in to a + # resource, for example. + context "when included in a class that defines the required interface in a superclass" do + + let(:recipe) { RecipeDSLExampleSubclass.new(cookbook_name, recipe_name) } + + include_examples "A Recipe DSL Implementation" + + end + +end + |