Merge pull request #2197 from opscode/sersut/fixup-chef-1662

Keep deprecation of valid_actions until Chef 13.

2 files changed, 33 insertions, 1 deletions

diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb
index 19c1aa4269..a4606be842 100644
--- a/lib/chef/resource/lwrp_base.rb
+++ b/lib/chef/resource/lwrp_base.rb
@@ -110,10 +110,21 @@ class Chef
         if action_names.empty?
           defined?(@actions) ? @actions : from_superclass(:actions, []).dup
         else
-          @actions = action_names
+          # BC-compat way for checking if actions have already been defined
+          if defined?(@actions)
+            @actions.push(*action_names)
+          else
+            @actions = action_names
+          end
         end
       end
 
+      # @deprecated
+      def self.valid_actions(*args)
+        Chef::Log.warn("`valid_actions' is deprecated, please use actions `instead'!")
+        actions(*args)
+      end
+
       # Set the run context on the class. Used to provide access to the node
       # during class definition.
       def self.run_context=(run_context)
diff --git a/spec/unit/lwrp_spec.rb b/spec/unit/lwrp_spec.rb
index 28d32d71ba..452e1da2a4 100644
--- a/spec/unit/lwrp_spec.rb
+++ b/spec/unit/lwrp_spec.rb
@@ -231,6 +231,27 @@ describe "LWRP" do
           expect(child.default_action).to eq(:dont_eat)
         end
       end
+
+      context "when actions are already defined" do
+        let(:child) do
+          Class.new(parent) do
+            actions :eat
+            actions :sleep
+            actions :drink
+          end
+        end
+
+        def raise_if_deprecated!
+          if Chef::VERSION.split('.').first.to_i > 12
+            raise "This test should be removed and the associated code should be removed!"
+          end
+        end
+
+        it "ammends actions when they are already defined" do
+          raise_if_deprecated!
+          expect(child.actions).to eq([:eat, :sleep, :drink])
+        end
+      end
     end
 
   end