foreman_puppet 2.0.0.alpha.2 → 2.0.0

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/integration/foreman_puppet/dashboard_js_test.rb

@@ -0,0 +1,31 @@
+require 'test_puppet_helper'
+require 'integration_test_helper'
+require 'integration/shared/host_finders'
+require 'integration/shared/host_orchestration_stubs'
+
+module ForemanPuppet
+  class DashboardJSTest < IntegrationTestWithJavascript
+    setup do
+      Dashboard::Manager.reset_user_to_default(users(:admin))
+      Setting[:outofsync_interval] = 35
+    end
+
+    context 'with origin' do
+      setup do
+        Setting[:puppet_out_of_sync_disabled] = true
+      end
+
+      context 'out of sync disabled' do
+        test 'has no out of sync link' do
+          visit dashboard_path
+          wait_for_ajax
+          within "li[data-name='Host Configuration Status for Puppet']" do
+            assert page.has_no_link?('Out of sync hosts')
+            assert page.has_no_link?('Good host reports in the last')
+            assert page.has_link?('Good host with reports')
+          end
+        end
+      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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ondřej Ezr
 - Shira Maximov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -186,23 +186,25 @@ files:
 - 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/20210924103241_remove_katello_id_from_environments.foreman_puppet.rb
-- db/migrate_foreman/20090722141107_create_environments.rb
-- db/migrate_foreman/20090802062223_create_puppetclasses.rb
-- db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.rb
-- db/migrate_foreman/20110412103238_remove_unused_fields_from_puppet_classes.rb
-- db/migrate_foreman/20110712070522_create_host_class.rb
-- db/migrate_foreman/20120824142048_add_some_indexes.rb
-- db/migrate_foreman/20120905095532_create_environment_classes.rb
-- db/migrate_foreman/20121018152459_create_hostgroup_classes.rb
-- db/migrate_foreman/20140407161817_create_config_groups.rb
-- db/migrate_foreman/20140407162007_create_config_group_classes.rb
-- db/migrate_foreman/20140407162059_create_host_config_groups.rb
-- db/migrate_foreman/20161205142618_delete_orphaned_smart_class_parameters.rb
-- db/migrate_foreman/20170109115157_fix_lookup_key_auditable_type.rb
-- db/migrate_foreman/20180816134832_cast_lookup_key_values.rb
-- db/migrate_foreman/20180831115634_add_uniqueness_to_puppetclass_name.rb
-- db/migrate_foreman/20181023112532_add_environment_puppetclass_id.rb
-- db/migrate_foreman/20181224174419_add_index_to_environment_class_by_lookup_key_and_puppetclass.rb
+- db/migrate/20211111125003_drop_puppetclasses_direct_references.foreman_puppet.rb
+- db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb
+- db/migrate_foreman/20090722141107_create_environments.foreman_puppet.rb
+- db/migrate_foreman/20090802062223_create_puppetclasses.foreman_puppet.rb
+- db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb
+- db/migrate_foreman/20110412103238_remove_unused_fields_from_puppet_classes.foreman_puppet.rb
+- db/migrate_foreman/20110712070522_create_host_class.foreman_puppet.rb
+- db/migrate_foreman/20120824142048_add_some_indexes.foreman_puppet.rb
+- db/migrate_foreman/20120905095532_create_environment_classes.foreman_puppet.rb
+- db/migrate_foreman/20121018152459_create_hostgroup_classes.foreman_puppet.rb
+- db/migrate_foreman/20140407161817_create_config_groups.foreman_puppet.rb
+- db/migrate_foreman/20140407162007_create_config_group_classes.foreman_puppet.rb
+- db/migrate_foreman/20140407162059_create_host_config_groups.foreman_puppet.rb
+- db/migrate_foreman/20161205142618_delete_orphaned_smart_class_parameters.foreman_puppet.rb
+- db/migrate_foreman/20170109115157_fix_lookup_key_auditable_type.foreman_puppet.rb
+- db/migrate_foreman/20180816134832_cast_lookup_key_values.foreman_puppet.rb
+- db/migrate_foreman/20180831115634_add_uniqueness_to_puppetclass_name.foreman_puppet.rb
+- db/migrate_foreman/20181023112532_add_environment_puppetclass_id.foreman_puppet.rb
+- db/migrate_foreman/20181224174419_add_index_to_environment_class_by_lookup_key_and_puppetclass.foreman_puppet.rb
 - db/seeds.d/111_puppet_proxy_feature.rb
 - lib/foreman_puppet.rb
 - lib/foreman_puppet/engine.rb
@@ -211,14 +213,50 @@ files:
 - lib/tasks/foreman_puppet_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/ca/LC_MESSAGES/foreman_puppet.mo
+- locale/ca/foreman_puppet.po
+- locale/cs_CZ/LC_MESSAGES/foreman_puppet.mo
+- locale/cs_CZ/foreman_puppet.edit.po
+- locale/cs_CZ/foreman_puppet.po
+- locale/cs_CZ/foreman_puppet.po.time_stamp
+- locale/de/LC_MESSAGES/foreman_puppet.mo
+- locale/de/foreman_puppet.po
 - locale/en/LC_MESSAGES/foreman_puppet.mo
 - locale/en/foreman_puppet.edit.po
 - locale/en/foreman_puppet.po
 - locale/en/foreman_puppet.po.time_stamp
 - locale/en/foreman_puppet.pox
+- locale/en_GB/LC_MESSAGES/foreman_puppet.mo
+- locale/en_GB/foreman_puppet.po
+- locale/es/LC_MESSAGES/foreman_puppet.mo
+- locale/es/foreman_puppet.po
 - locale/foreman_puppet.pot
+- locale/fr/LC_MESSAGES/foreman_puppet.mo
+- locale/fr/foreman_puppet.po
 - locale/gemspec.rb
+- locale/gl/LC_MESSAGES/foreman_puppet.mo
+- locale/gl/foreman_puppet.po
+- locale/it/LC_MESSAGES/foreman_puppet.mo
+- locale/it/foreman_puppet.po
+- locale/ja/LC_MESSAGES/foreman_puppet.mo
+- locale/ja/foreman_puppet.po
+- locale/ko/LC_MESSAGES/foreman_puppet.mo
+- locale/ko/foreman_puppet.po
 - locale/messages.mo
+- locale/nl_NL/LC_MESSAGES/foreman_puppet.mo
+- locale/nl_NL/foreman_puppet.po
+- locale/pl/LC_MESSAGES/foreman_puppet.mo
+- locale/pl/foreman_puppet.po
+- locale/pt_BR/LC_MESSAGES/foreman_puppet.mo
+- locale/pt_BR/foreman_puppet.po
+- locale/ru/LC_MESSAGES/foreman_puppet.mo
+- locale/ru/foreman_puppet.po
+- locale/sv_SE/LC_MESSAGES/foreman_puppet.mo
+- locale/sv_SE/foreman_puppet.po
+- locale/zh_CN/LC_MESSAGES/foreman_puppet.mo
+- locale/zh_CN/foreman_puppet.po
+- locale/zh_TW/LC_MESSAGES/foreman_puppet.mo
+- locale/zh_TW/foreman_puppet.po
 - package.json
 - test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
 - test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
@@ -255,6 +293,7 @@ files:
 - test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
+- test/integration/foreman_puppet/dashboard_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
 - test/integration/foreman_puppet/host_js_test.rb
 - test/integration/foreman_puppet/hostgroup_js_test.rb
@@ -309,7 +348,7 @@ homepage: https://github.com/theforeman/foreman_puppet
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -320,12 +359,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files:
@@ -337,6 +376,7 @@ test_files:
 - test/integration/foreman_puppet/puppetclass_js_test.rb
 - test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/environment_js_test.rb
+- test/integration/foreman_puppet/dashboard_js_test.rb
 - test/integration/foreman_puppet/host_js_test.rb
 - test/graphql/mutations/hosts/create_mutation_test.rb
 - test/graphql/queries/puppetclasses_query_test.rb