Add inheritance and repeat tests for action_class dojk/action-class-do

1 files changed, 47 insertions, 3 deletions

diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb
index a55ea72b3f..0ea67ea5f2 100644
--- a/spec/integration/recipes/resource_action_spec.rb
+++ b/spec/integration/recipes/resource_action_spec.rb
@@ -430,22 +430,36 @@ describe "Resource.action" do
     class DeclaresActionClassMethods < Chef::Resource
       use_automatic_resource_name
       property :x
-      action :hi do
-        new_resource.x = a + b
+      action :create do
+        new_resource.x = a + b + c + d
       end
       action_class do
         def a
           1
         end
+      end
+      declare_action_class do
         def b
           2
         end
       end
+      action_class do
+        def c
+          3
+        end
+      end
+      declare_action_class do
+        def d
+          4
+        end
+      end
     end
 
     it "the methods are not available on the resource" do
       expect { DeclaresActionClassMethods.new('hi').a }.to raise_error(NameError)
       expect { DeclaresActionClassMethods.new('hi').b }.to raise_error(NameError)
+      expect { DeclaresActionClassMethods.new('hi').c }.to raise_error(NameError)
+      expect { DeclaresActionClassMethods.new('hi').d }.to raise_error(NameError)
     end
 
     it "the methods are available to the action" do
@@ -453,7 +467,37 @@ describe "Resource.action" do
       expect_recipe {
         r = declares_action_class_methods 'hi'
       }.to emit_no_warnings_or_errors
-      expect(r.x).to eq(3)
+      expect(r.x).to eq(10)
+    end
+
+    context "And a subclass also creates a method" do
+      class DeclaresActionClassMethodsToo < DeclaresActionClassMethods
+        use_automatic_resource_name
+        action :create do
+          new_resource.x a+b+c+d+e
+        end
+        action_class do
+          def e
+            5
+          end
+        end
+      end
+
+      it "the methods are not available on the resource" do
+        expect { DeclaresActionClassMethods.new('hi').a }.to raise_error(NameError)
+        expect { DeclaresActionClassMethods.new('hi').b }.to raise_error(NameError)
+        expect { DeclaresActionClassMethods.new('hi').c }.to raise_error(NameError)
+        expect { DeclaresActionClassMethods.new('hi').d }.to raise_error(NameError)
+        expect { DeclaresActionClassMethods.new('hi').e }.to raise_error(NameError)
+      end
+
+      it "the methods are available to the action" do
+        r = nil
+        expect_recipe {
+          r = declares_action_class_methods_too 'hi'
+        }.to emit_no_warnings_or_errors
+        expect(r.x).to eq(15)
+      end
     end
   end
 end