poise 2.2.3 → 2.3.0

data/test/spec/helpers/resource_name_spec.rb

@@ -21,6 +21,13 @@ class ResourceNameHelper < Chef::Resource
   provides(:provides_test)
 end
 
+# Helper for testing multiple names.
+class ResourceNameHelperTwo < Chef::Resource
+  include Poise::Helpers::ResourceName
+  provides(:provides_test_two)
+  provides(:provides_test_2)
+end
+
 describe Poise::Helpers::ResourceName do
   context 'via class.name' do
     resource(:poise_test, auto: false) do
@@ -29,11 +36,17 @@ describe Poise::Helpers::ResourceName do
     subject { resource(:poise_test).new(nil, nil).resource_name }
 
     it { is_expected.to eq :poise_test }
-  end
+  end # /context via class.name
 
   context 'via provides' do
     subject { ResourceNameHelper.new(nil, nil).resource_name }
 
     it { is_expected.to eq :provides_test }
-  end
+  end # /context via provides
+
+  context 'with multiple names' do
+    subject { ResourceNameHelperTwo.new(nil, nil).resource_name }
+
+    it { is_expected.to eq :provides_test_two }
+  end # /context with multiple names
 end

data/test/spec/helpers/resource_subclass_spec.rb

@@ -0,0 +1,97 @@
+#
+# Copyright 2015, Noah Kantrowitz
+#
+# 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/resource'
+require 'chef/provider'
+
+# Not defined using the helpers because I need it to be visible outside of
+# example execution.
+module PoiseTestSubclass
+  class Resource < Chef::Resource
+    include Poise
+    provides(:poise_test_subclass)
+  end
+  class Provider < Chef::Provider
+    include Poise
+    provides(:poise_test_subclass)
+    def action_run
+      node.run_state[:really_did_run] = true
+    end
+  end
+end
+
+describe Poise::Helpers::ResourceSubclass do
+  describe '.subclass_providers!' do
+    resource(:poise_sub, parent: PoiseTestSubclass::Resource) do
+      provides(:poise_sub)
+      subclass_providers!
+    end
+    recipe do
+      poise_sub 'test'
+    end
+
+    it { is_expected.to run_poise_sub('test') }
+    it { expect(chef_run.node.run_state[:really_did_run]).to be true }
+  end # /describe .subclass_providers!
+
+  describe '.subclass_resource_equivalents' do
+    let(:test_class) { nil }
+    subject { test_class.subclass_resource_equivalents }
+    resource(:poise_sub, parent: PoiseTestSubclass::Resource) do
+      provides(:poise_sub)
+      subclass_providers!
+    end
+
+    context 'with a top-level class' do
+      let(:test_class) { PoiseTestSubclass::Resource }
+      it { is_expected.to eq %i{poise_test_subclass} }
+    end # /context with a top-level class
+
+    context 'with a subclass' do
+      let(:test_class) { resource(:poise_sub) }
+      it { is_expected.to eq %i{poise_sub poise_test_subclass} }
+    end # /context with a subclass
+
+    context 'with an unpatched subclass' do
+      resource(:poise_sub2, parent: PoiseTestSubclass::Resource) do
+        provides(:poise_sub2)
+      end
+      let(:test_class) { resource(:poise_sub2) }
+      it { is_expected.to eq %i{poise_sub2} }
+    end # /context with an unpatched subclass
+
+    context 'with two subclasses' do
+      resource(:poise_sub2, parent: :poise_sub) do
+        provides(:poise_sub2)
+        subclass_providers!
+      end
+      let(:test_class) { resource(:poise_sub2) }
+      it { is_expected.to eq %i{poise_sub2 poise_sub poise_test_subclass} }
+    end # /context with two subclasses
+
+    context 'with a non-poise parent' do
+      resource(:non_poise_parent)
+      resource(:poise_sub3, parent: :non_poise_parent) do
+        include Poise
+        provides(:poise_sub3)
+        subclass_providers!
+      end
+      let(:test_class) { resource(:poise_sub3) }
+      it { is_expected.to eq %i{poise_sub3 non_poise_parent} }
+    end # /context with a non-poise parent
+  end # /describe .subclass_resource_equivalents
+end

data/test/spec/helpers/subresources/child_spec.rb

@@ -31,6 +31,25 @@ describe Poise::Helpers::Subresources::Child do
       parent_type :poise_container
     end
 
+    context 'with an automatic parent' do
+      recipe do
+        poise_container 'test'
+        poise_test 'test'
+      end
+
+      it { is_expected.to run_poise_test('test').with(parent: container) }
+    end # /context with an automatic parent
+
+    context 'with an automatic parent and an extra container' do
+      recipe do
+        poise_container 'test'
+        poise_test 'test'
+        poise_container 'other'
+      end
+
+      it { is_expected.to run_poise_test('test').with(parent: container) }
+    end # /context with an automatic parent and an extra container
+
     context 'with a resource parent' do
       recipe do
         c = poise_container 'test'
@@ -42,6 +61,18 @@ describe Poise::Helpers::Subresources::Child do
       it { is_expected.to run_poise_test('test').with(parent: container) }
     end # /context with a resource parent
 
+    context 'with a resource parent and an extra container' do
+      recipe do
+        c = poise_container 'test'
+        poise_container 'other'
+        poise_test 'test' do
+          parent c
+        end
+      end
+
+      it { is_expected.to run_poise_test('test').with(parent: container) }
+    end # /context with a resource parent and an extra container
+
     context 'with a string name parent' do
       recipe do
         poise_container 'test'
@@ -214,6 +245,94 @@ describe Poise::Helpers::Subresources::Child do
 
       it { expect { subject }.to raise_error NoMethodError }
     end # /context with a parent type of true
+
+    context 'with a subclassed parent type' do
+      resource(:poise_sub, parent: :poise_container)
+      provider(:poise_sub, parent: :poise_container)
+      let(:sub) { chef_run.poise_sub('test') }
+
+      context 'with an automatic parent' do
+        recipe do
+          poise_sub 'test'
+          poise_test 'test'
+        end
+
+        it { is_expected.to run_poise_test('test').with(parent: sub) }
+      end # /context with an automatic parent
+
+      context 'with a resource parent' do
+        recipe do
+          c = poise_sub 'test'
+          poise_test 'test' do
+            parent c
+          end
+        end
+
+        it { is_expected.to run_poise_test('test').with(parent: sub) }
+      end # /context with a resource parent
+
+      context 'with a string name parent' do
+        recipe do
+          poise_sub 'test'
+          poise_test 'test' do
+            parent 'test'
+          end
+        end
+
+        it { is_expected.to run_poise_test('test').with(parent: sub) }
+      end # /context with a string name parent
+
+      context 'with an explicit string parent' do
+        recipe do
+          poise_sub 'test'
+          poise_test 'test' do
+            parent 'poise_sub[test]'
+          end
+        end
+
+        it { is_expected.to run_poise_test('test').with(parent: sub) }
+      end # /context with an explicit string parent
+
+      context 'with a hash parent' do
+        recipe do
+          poise_sub 'test'
+          poise_test 'test' do
+            parent poise_sub: 'test'
+          end
+        end
+
+        it { is_expected.to run_poise_test('test').with(parent: sub) }
+      end # /context with a hash parent
+    end # /context with a subclassed parent type
+
+    context 'with a default' do
+      resource(:poise_test) do
+        include described_class
+        parent_type :poise_container
+        parent_default Chef::DelayedEvaluator.new { run_context.resource_collection.find('poise_container[first]') }
+      end
+      recipe do
+        poise_container 'first'
+        poise_container 'second'
+        poise_test 'test'
+      end
+
+      it { is_expected.to run_poise_test('test').with(parent: chef_run.poise_container('first')) }
+    end # /context with a default
+
+    context 'setting the parent to itself' do
+      resource(:poise_test) do
+        include described_class
+        parent_type :poise_test
+      end
+      recipe do
+        poise_test 'test' do
+          parent self
+        end
+      end
+
+      it { expect { subject }.to raise_error Poise::Error }
+    end # /context setting the parent to itself
   end # /describe #parent
 
   describe '.parent_type' do
@@ -255,6 +374,15 @@ describe Poise::Helpers::Subresources::Child do
       it { is_expected.to eq :something }
     end # /context set to a symbol
 
+    context 'set to true' do
+      resource(:poise_test) do
+        include described_class
+        parent_type true
+      end
+
+      it { is_expected.to eq true }
+    end # /context set to true
+
     context 'set to an invalid value' do
       resource(:poise_test) do
         include described_class
@@ -287,7 +415,40 @@ describe Poise::Helpers::Subresources::Child do
       end
 
       it { is_expected.to eq :something }
-    end
+    end # /context set via a mixin
+
+    context 'set to true via a mixin' do
+      # Various scoping shenanigans.
+      described = described_class
+      test_mod = Module.new do
+        include described
+        parent_type true
+      end
+      resource(:poise_test) do
+        include test_mod
+      end
+
+      it { is_expected.to eq true }
+    end # /context set to true via a mixin
+
+    context 'set via multiple mixins' do
+      # Various scoping shenanigans.
+      described = described_class
+      test_mod1 = Module.new do
+        include described
+        parent_type :something
+      end
+      test_mod2 = Module.new do
+        include described
+        parent_type true
+      end
+      resource(:poise_test) do
+        include test_mod1
+        include test_mod2
+      end
+
+      it { is_expected.to eq :something }
+    end # context set via multiple mixins
   end # /describe .parent_type
 
   describe '.parent_optional' do
@@ -350,7 +511,60 @@ describe Poise::Helpers::Subresources::Child do
 
       it { is_expected.to eq true }
     end # /context not set
-  end
+  end # /describe .parent_auto
+
+  describe '.parent_default' do
+    subject { resource(:poise_test).parent_default }
+
+    context 'set directly' do
+      resource(:poise_test) do
+        include described_class
+        parent_default Chef::Resource.new(nil, nil)
+      end
+
+      it { is_expected.to be_a Chef::Resource }
+    end # /context set directly
+
+    context 'set on a parent class' do
+      resource(:poise_parent) do
+        include described_class
+        parent_default Chef::Resource.new(nil, nil)
+      end
+      resource(:poise_test, parent: :poise_parent)
+
+      it { is_expected.to be_a Chef::Resource }
+    end # /context set on a parent class
+
+    context 'not set' do
+      resource(:poise_test) do
+        include described_class
+      end
+
+      it { is_expected.to be_nil }
+    end # /context not set
+
+    context 'set to nil' do
+      resource(:poise_parent) do
+        include described_class
+        parent_default Chef::Resource.new(nil, nil)
+      end
+      resource(:poise_test, parent: :poise_parent) do
+        parent_default nil
+      end
+
+      it { is_expected.to be_nil }
+    end # /context set to nil
+
+    context 'set to lazy{}' do
+      resource(:poise_test) do
+        include described_class
+        include Poise::Helpers::LazyDefault
+        parent_default lazy { }
+      end
+
+      it { is_expected.to be_a Chef::DelayedEvaluator }
+    end # /context set to lazy{}
+  end # /describe .parent_default
 
   describe '.parent_attribute' do
     resource(:poise_test) do
@@ -405,4 +619,22 @@ describe Poise::Helpers::Subresources::Child do
       it { is_expected.to include 'parent nil' }
     end # /context without a parent
   end # /describe ParentRef
+
+  describe 'regression test for ordering bug' do
+    resource(:poise_test) do
+      include Poise
+      include Module.new {
+        include Poise::Resource
+        poise_subresource(true)
+        parent_attribute(:container, type: :poise_container, optional: true)
+      }
+    end
+    recipe do
+      poise_container 'one'
+      poise_test 'test'
+      poise_container 'two'
+    end
+
+    it { is_expected.to run_poise_test('test').with(parent_container: chef_run.poise_container('one')) }
+  end # /describe regression test for ordering bug
 end

data/test/spec/helpers/subresources/container_spec.rb

@@ -146,6 +146,27 @@ describe Poise::Helpers::Subresources::Container do
     it { is_expected.to run_inner('container') }
   end # /context with a no namespace and no inner name
 
+  describe '#container_default' do
+    resource(:poise_test) do
+      include described_class
+    end
+    resource(:poise_sub, parent: :poise_test) do
+      container_default(false)
+    end
+    provider(:poise_sub, parent: :poise_test)
+    resource(:inner) do
+      include Poise(parent: :poise_test)
+    end
+    recipe do
+      poise_test 'one'
+      poise_test 'two'
+      poise_sub 'three'
+      inner 'inner'
+    end
+
+    it { is_expected.to run_inner('inner').with(parent: chef_run.poise_test('two')) }
+  end # /describe #container_default
+
   describe 'resource order' do
     resource(:poise_test) do
       include described_class
@@ -187,4 +208,20 @@ describe Poise::Helpers::Subresources::Container do
       is_expected.to run_inner('container::two')
     end
   end # /describe resource order
+
+  describe 'subclassing a container' do
+    resource(:poise_test) do
+      include described_class
+    end
+    resource(:poise_sub, parent: :poise_test)
+    provider(:poise_sub, parent: :poise_test)
+    recipe do
+      poise_sub 'test' do
+        inner 'one'
+      end
+    end
+
+    it { is_expected.to run_poise_sub('test') }
+    it { is_expected.to run_inner('test::one') }
+  end # /describe subclassing a container
 end