foreman_puppet 1.0.4 → 1.0.5

data/test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb

@@ -9,49 +9,88 @@ module ForemanPuppet
     include HostsAndHostgroupsHelper
 
     describe 'puppet environment field' do
+      let(:fields) { mock('fields_for') }
+      let(:f) { mock('form_for') }
+      let(:object) { mock('object') }
+      let(:puppet_facet) { mock('puppet') }
+
       setup do
-        @host = mock('host')
-        puppet = mock('puppet')
-        @host.stubs(:hostgroup)
-        @host.stubs(:puppet).returns(puppet)
-        @host.stubs(:id).returns(999)
-        @f = mock('f')
-        @f.stubs(:object).returns(@host)
-        @fields = mock('fields')
-        @fields.stubs(:object).returns(puppet)
-        @f.stubs(:fields_for).yields(@fields)
+        f.stubs(:object).returns(object)
+        f.stubs(:fields_for).yields(fields)
+        fields.stubs(:object).returns(puppet_facet)
       end
 
-      test 'it adds new first level attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          select_options, html_options = extract_collection_options(attrs)
-          select_options[:test_select_option] == 'test_value1' &&
-            html_options[:test_html_option] == 'test_value2'
+      describe '#host_puppet_environment_field' do
+        let(:object) do
+          host = mock('host')
+          host.stubs(:hostgroup)
+          host.stubs(:puppet).returns(puppet_facet)
+          host.stubs(:id).returns(999)
+          host
         end
 
-        host_puppet_environment_field(@f, { test_select_option: 'test_value1' }, { test_html_option: 'test_value2' })
-      end
+        test 'it adds new first level attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            select_options, html_options = extract_collection_options(attrs)
+            select_options[:test_select_option] == 'test_value1' &&
+              html_options[:test_html_option] == 'test_value2'
+          end
 
-      test 'it adds new data attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          select_options, html_options = extract_collection_options(attrs)
-          select_options[:test_select_option] == 'test_value1' &&
-            html_options[:data][:test] == 'test_value2'
+          host_puppet_environment_field(f, { test_select_option: 'test_value1' }, { test_html_option: 'test_value2' })
         end
 
-        host_puppet_environment_field(@f, { test_select_option: 'test_value1' }, { data: { test: 'test_value2' } })
+        test 'it adds new data attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            select_options, html_options = extract_collection_options(attrs)
+            select_options[:test_select_option] == 'test_value1' &&
+              html_options[:data][:test] == 'test_value2'
+          end
+
+          host_puppet_environment_field(f, { test_select_option: 'test_value1' }, { data: { test: 'test_value2' } })
+        end
+
+        test 'it overrides existing attributes' do
+          fields.expects(:collection_select).with do |*attrs|
+            html_options = attrs.pop
+            html_options[:data][:test] == 'some_test_value' &&
+              html_options[:data][:url] == '/test/url'
+          end.returns('')
+
+          html = host_puppet_environment_field(f, { disable_button: false }, { data: { url: '/test/url', test: 'some_test_value' } })
+
+          assert_no_match(/btn/, html)
+        end
       end
 
-      test 'it overrides existing attributes' do
-        @fields.expects(:collection_select).with do |*attrs|
-          html_options = attrs.pop
-          html_options[:data][:test] == 'some_test_value' &&
-            html_options[:data][:url] == '/test/url'
-        end.returns('')
+      describe '#hostgroup_puppet_environment_field' do
+        let(:object) { FactoryBot.build_stubbed(:hostgroup, parent: parent_hg) }
+        let(:puppet_facet) { object.puppet || object.build_puppet }
+
+        context 'parent without puppet' do
+          let(:parent_hg) { FactoryBot.create(:hostgroup) }
 
-        html = host_puppet_environment_field(@f, { disable_button: false }, { data: { url: '/test/url', test: 'some_test_value' } })
+          it 'shows Inherit option with no value' do
+            fields.expects(:collection_select).with do |*attrs|
+              options = attrs.second
+              options.first.to_label == 'Inherit parent (no value)'
+            end.returns('')
+
+            hostgroup_puppet_environment_field(f)
+          end
+        end
 
-        assert_no_match(/btn/, html)
+        context 'parent with puppet' do
+          let(:parent_hg) { FactoryBot.create(:hostgroup, :with_puppet_enc) }
+
+          it 'shows Inherit option with no value' do
+            fields.expects(:collection_select).with do |*attrs|
+              options = attrs.second
+              options.first.to_label == "Inherit parent (#{parent_hg.puppet.environment.name})"
+            end.returns('')
+
+            hostgroup_puppet_environment_field(f)
+          end
+        end
       end
     end
 

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -107,7 +107,13 @@ module ForemanPuppet
       test 'should return empty array if host has no hostgroup' do
         host = FactoryBot.create(:host, :with_puppet_enc)
         assert_not host.hostgroup
-        assert_empty host.puppet.parent_config_groups
+        assert_equal [], host.puppet.parent_config_groups
+      end
+
+      test 'should return empty array if hostgroup do not have puppet data' do
+        hostgroup = FactoryBot.create(:hostgroup)
+        host = FactoryBot.create(:host, :with_puppet_enc, hostgroup: hostgroup)
+        assert_equal [], host.puppet.parent_config_groups
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environmets and classes to the Foreman Hosts.
 email:
@@ -183,6 +183,7 @@ files:
 - db/migrate/20200803113803_migrate_environment_to_puppet_facet.foreman_puppet.rb
 - db/migrate/20200803113903_migrate_host_type_in_host_config_groups.foreman_puppet.rb
 - db/migrate/20201125113903_migrate_puppetclasses_to_facets.foreman_puppet.rb
+- db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb
 - db/migrate_foreman/20090722141107_create_environments.rb
 - db/migrate_foreman/20120905095532_create_environment_classes.rb
 - db/migrate_foreman/20140407161817_create_config_groups.rb
@@ -201,6 +202,8 @@ files:
 - lib/tasks/foreman_puppet_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/cs_CZ/foreman_puppet.edit.po
+- locale/cs_CZ/foreman_puppet.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_puppet.mo
 - locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po