foreman_puppet 2.0.2 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6a528bcec7516d10a4b94f455b9ba0eae4ce8ce978d4a242e504d1b73e430b
-  data.tar.gz: 44593d006e0f911a1c43f75ee23cfd949b38ff4766e7cd43c291c528c20a0a97
+  metadata.gz: 60ff3828222cc632f3ede70b60d3789bc68cd9565a501293ff037d16f089e875
+  data.tar.gz: 4446e0632671fe04ac826ae0c6ca1315ffe2dc4555acf252ee93c7a322b9f0fc
 SHA512:
-  metadata.gz: 6ee6bee3076a1550b35427f9df89361d5d0bf96e205916999f2f0631e69c1d22d2b2afa31d0d511a43b6f3ea8f68ec0a62dda08ff84c35451de9f36cbcf87059
-  data.tar.gz: fa627b81d596bfe7501a335546cf16fcf66c95f7dbd3f3c807bf4c1b99cb8cc3ba3a4688729f2f9a4e2bf2e0b66f749fdba065362e5673f3f940e44bfdb6c403
+  metadata.gz: a8176437ecad24bbcbd707459114bedbadd20905ba031142cf9634aec2efe77adf6c790412b65162358c016df2999739c8b4b2f4d4c322d56673325ccf3aa65b
+  data.tar.gz: 723ab74a3fc1b20954e446018508bd61fd35ea04fce200049cb306f04ee6240289ec136d34b00a4873ec51e211781fdb93722baabf04bcf19b777a4f211a85af

data/README.md

@@ -37,7 +37,9 @@ You can install it on Foreman 2.5 to prepare for the Foreman update.
 
 |Foreman version|Plugin version|Notes                                     |
 |---------------|--------------|------------------------------------------|
-| >= 3.0        | ~> 1.0       | Required                                 |
+| >= 3.2        | ~> 3.0       | Required                                 |
+| ~> 3.1        | ~> 2.0       | Required                                 |
+| ~> 3.0        | ~> 1.0       | Required                                 |
 | >= 2.5        | ~> 0.1       | Optional; replaces Core features         |
 | < 2.5         | -            | Not supported (functionality is in Core) |
 

data/app/controllers/concerns/foreman_puppet/extensions/api_smart_proxies_controller.rb

@@ -3,6 +3,8 @@ module ForemanPuppet
     module ApiSmartProxiesController
       extend ActiveSupport::Concern
 
+      NewEnvironment = Struct.new('Environment', :name)
+
       included do
         before_action :find_required_puppet_proxy, only: [:import_puppetclasses]
         before_action :find_environment_id, only: [:import_puppetclasses]
@@ -70,7 +72,7 @@ module ForemanPuppet
                              @changed['updated'].keys + @changed['ignored'].keys).uniq.sort
 
         @environments = environment_names.map do |name|
-          OpenStruct.new(name: name)
+          NewEnvironment.new(name)
         end
 
         unless @environments.any?
@@ -87,6 +89,7 @@ module ForemanPuppet
         @environments.any?
       end
 
+      # rubocop:disable Metrics/MethodLength
       def import_changed_proxy_environments
         opts = { url: @smart_proxy.url }
         opts[:env] = if @environment.present?
@@ -98,7 +101,8 @@ module ForemanPuppet
         changed = @importer.changes
 
         # check if environemnt id passed in URL is name of NEW environment in puppetmaster that doesn't exist in db
-        if @environment || (changed['new'].key?(@env_id) && (@environment ||= OpenStruct.new(name: @env_id)))
+        @environment ||= NewEnvironment.new(@env_id) if changed['new'].key?(@env_id)
+        if @environment
           # only return :keys equal to @environment in @changed hash
           %w[new obsolete updated ignored].each do |kind|
             changed[kind].slice!(@environment.name) unless changed[kind].empty?
@@ -115,6 +119,7 @@ module ForemanPuppet
         render_message(msg, status: :internal_server_error)
         nil
       end
+      # rubocop:enable Metrics/MethodLength
 
       def find_required_puppet_proxy
         id = params.key?('smart_proxy_id') ? params['smart_proxy_id'] : params['id']

data/app/controllers/concerns/foreman_puppet/extensions/hosts_controller_extensions.rb

@@ -3,7 +3,7 @@ module ForemanPuppet
     module HostsControllerExtensions
       extend ActiveSupport::Concern
 
-      PUPPETMASTER_ACTIONS = %i[externalNodes lookup].freeze
+      PUPPETMASTER_ACTIONS = %i[externalNodes].freeze
       PUPPET_AJAX_REQUESTS = %w[hostgroup_or_environment_selected puppetclass_parameters].freeze
 
       MULTIPLE_EDIT_ACTIONS = %w[select_multiple_environment update_multiple_environment

data/app/helpers/foreman_puppet/puppetclass_lookup_keys_helper.rb

@@ -9,7 +9,7 @@ module ForemanPuppet
     # ------ Host(group) Form Helpers -----
 
     def overridable_puppet_lookup_keys(klass, obj)
-      klass.class_params.override.where(environment_classes: { environment_id: obj.environment_id })
+      klass.class_params.override.where(environment_classes: { environment_id: obj.environment })
     end
 
     def hidden_puppet_lookup_value_fields(lookup_key, lookup_value, disabled)

data/app/models/concerns/foreman_puppet/extensions/provisioning_template.rb

@@ -5,7 +5,7 @@ module ForemanPuppet
 
       included do
         has_many :environments, through: :template_combinations
-        before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:environments)
+        before_destroy EnsureNotUsedBy.new(:environments)
 
         scoped_search relation: :environments, on: :name, rename: :environment, complete_value: true
 

data/app/services/foreman_puppet/host_info_providers/puppet_info.rb

@@ -45,7 +45,7 @@ module ForemanPuppet
       end
 
       def ca_defined?
-        SETTINGS[:unattended] && host.puppetca_exists?
+        host.puppetca_exists?
       end
 
       def has_environment?

data/app/views/foreman_puppet/config_groups/_config_group.html.erb

@@ -1,4 +1,8 @@
-<%= content_tag_for :li, config_group, (added ? :selected : nil), :id => "config_group_#{config_group.id}", :class => css_class.to_s do %>
+<%
+  li_id = "#{added ? 'selected_' : '' }config_group_#{config_group.id}"
+  li_class = "#{added ? 'selected_config_group' : 'config_group'} #{css_class}"
+%>
+<%= content_tag :li, id: li_id, class: li_class do %>
   <%= hidden_field_tag("#{type}[config_group_ids][]", config_group.id) if added == 'manually' %>
   <span>
    <%= link_to(icon_text('plus', config_group.name), '#', :rel=>'twipsy', :class => 'config_group_name',

data/app/views/hosts/_form_puppet_enc_tab.html.erb

@@ -11,13 +11,14 @@
   <% end %>
 
   <%= render 'foreman_puppet/puppetclasses/class_selection', obj: obj, resource_type: resource_type %>
+
+  <fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(controller: resource_type.to_s.pluralize.to_sym, action: :puppetclass_parameters, only_path: true) %>">
+    <h2><%= _('Puppet Class Parameters') %></h2>
+    <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: subject %>
+  </fieldset>
 <% else %>
   <%= alert(class: alert_class(:info),
             header: _('Notice'),
             text: _('Please select an environment first')) %>
 <% end %>
 
-<fieldset id="puppet_klasses_parameters" data-url="<%= foreman_puppet.url_for(controller: resource_type.to_s.pluralize.to_sym, action: :puppetclass_parameters, only_path: true) %>">
-  <h2><%= _('Puppet Class Parameters') %></h2>
-  <%= render 'foreman_puppet/puppetclasses/classes_parameters', obj: subject %>
-</fieldset>

data/db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb

@@ -0,0 +1,9 @@
+class MigrateHostClassPermission < ActiveRecord::Migration[6.0]
+  def up
+    Permission.where(resource_type: 'HostClass').update_all(resource_type: 'ForemanPuppet::HostClass')
+  end
+
+  def down
+    # no can do
+  end
+end

data/db/migrate/20220208135305_migrate_environment_ignore_type.foreman_puppet.rb

@@ -0,0 +1,15 @@
+class MigrateEnvironmentIgnoreType < ActiveRecord::Migration[6.0]
+  def up
+    taxonomies = Taxonomy.unscoped.where("ignore_types LIKE '%Environment%'")
+    environment_ids = ForemanPuppet::Environment.unscoped.pluck(:id)
+
+    taxonomies.each do |tax|
+      new_types = tax.ignore_types.reject { |type| type == 'Environment' }
+      tax.update_columns(ignore_types: new_types)
+      taxable_rows = environment_ids.map do |env_id|
+        { taxable_id: env_id, taxable_type: 'ForemanPuppet::Environment', taxonomy_id: tax.id }
+      end
+      TaxableTaxonomy.insert_all(taxable_rows) if taxable_rows.any?
+    end
+  end
+end

data/db/migrate_foreman/20090905150132_create_hostgroups_puppetclasses.foreman_puppet.rb

@@ -1,6 +1,8 @@
 class CreateHostgroupsPuppetclasses < ActiveRecord::Migration[6.0]
   def up
-    create_table :hostgroups_puppetclasses, id: false, if_not_exists: true do |t|
+    # this table is later renamed into hostgroup_classes and thus we don't want to create it if it exists under the later name
+    return if table_exists?(:hostgroups_puppetclasses) || table_exists?(:hostgroup_classes)
+    create_table :hostgroups_puppetclasses, id: false do |t|
       t.references :hostgroup, foreign_key: true, null: false
       t.references :puppetclass, foreign_key: true, null: false
     end

data/lib/foreman_puppet/register.rb

@@ -147,7 +147,8 @@ Foreman::Plugin.register :foreman_puppet do
     permission :import_puppetclasses, { 'foreman_puppet/puppetclasses' => %i[import_environments obsolete_and_new],
                                         'foreman_puppet/api/v2/environments' => [:import_puppetclasses] },
       resource_type: 'ForemanPuppet::Puppetclass'
-    permission :edit_classes, { 'foreman_puppet/api/v2/host_classes': %i[index create destroy] },
+    permission :edit_classes, { :host_editing => [:edit_classes],
+                                'foreman_puppet/api/v2/host_classes' => %i[index create destroy] },
       resource_type: 'ForemanPuppet::HostClass'
   end
 

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '2.0.2'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/test/controllers/foreman_puppet/api/v2/environments_controller_test.rb

@@ -11,27 +11,33 @@ module ForemanPuppet
         let(:environment_attrs) { { name: 'Development' } }
         let(:environment) { FactoryBot.create(:environment) }
 
-        test 'should get index' do
-          environment
-          get :index
-          assert_response :success
-          assert_not_nil assigns(:environments)
-          envs = ActiveSupport::JSON.decode(@response.body)
-          assert_not envs.empty?
-        end
+        describe 'GET #index' do
+          it 'gets index' do
+            environment
+            get :index
+            assert_response :success
+            assert_not_nil assigns(:environments)
+            envs = ActiveSupport::JSON.decode(@response.body)
+            assert_not envs.empty?
+          end
 
-        test 'should show environment by id or name' do
-          get :show, params: { id: environment.id }
-          assert_response :success
-          assert_equal environment.name, JSON.parse(@response.body)['name']
+          it 'shows environment by id' do
+            get :show, params: { id: environment.id }
+            assert_response :success
+            assert_equal environment.name, JSON.parse(@response.body)['name']
+          end
 
-          get :show, params: { id: environment.to_param }
-          assert_response :success
-          assert_equal environment.name, JSON.parse(@response.body)['name']
+          it 'shows environment by to_param' do
+            get :show, params: { id: environment.to_param }
+            assert_response :success
+            assert_equal environment.name, JSON.parse(@response.body)['name']
+          end
 
-          get :show, params: { id: environment.name }
-          assert_response :success
-          assert_equal environment.name, JSON.parse(@response.body)['name']
+          it 'shows environment by name' do
+            get :show, params: { id: environment.name }
+            assert_response :success
+            assert_equal environment.name, JSON.parse(@response.body)['name']
+          end
         end
 
         test 'should create environment' do

data/test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb

@@ -79,12 +79,22 @@ module ForemanPuppet
 
           test 'should update with puppet class' do
             puppetclass = environment.puppetclasses.first
+            # uses the deprecated version of params passing without namespace, to test it works :)
             put :update, params: { id: host.id, host: { environment_id: environment.id, puppetclass_ids: [puppetclass.id] } }
             assert_response :success
             response = JSON.parse(@response.body)
             assert_equal environment.id, response['environment_id'], "Can't update host with environment #{environment}"
             assert_equal puppetclass.id, response['puppetclasses'][0]['id'], "Can't update host with puppetclass #{puppetclass}"
           end
+
+          test 'should remove puppetclass by passing empty array' do
+            host2 = FactoryBot.create(:host, :with_puppet_enc, :with_puppetclass)
+
+            put :update, params: { id: host2.id, host: { puppet_attributes: { puppetclass_ids: [] } } }
+            assert_response :success
+            response = JSON.parse(@response.body)
+            assert_empty(response['puppetclasses'], 'Can not remove puppetclasses')
+          end
         end
 
         describe '#enc' do

data/test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb

@@ -421,7 +421,7 @@ module ForemanPuppet
 
         test_attributes pid: 'd5d5f084-fa62-4ec3-90ea-9fcabd7bda4f'
         test 'validate default value with list' do
-          values_list = [RFauxFactory.gen_alpha, RFauxFactory.gen_alphanumeric, rand(100..1 << 64), [true, false].sample]
+          values_list = [RFauxFactory.gen_alpha, RFauxFactory.gen_alphanumeric, rand(100..(1 << 64)), [true, false].sample]
           values_list_str = values_list.join(', ')
           value = values_list.sample
           put :update, params: { id: lookup_key.id, smart_class_parameter: { override: true,
@@ -437,7 +437,7 @@ module ForemanPuppet
 
         test_attributes pid: 'd5df7804-9633-4ef8-a065-10807351d230'
         test 'validate default value with regexp' do
-          value = rand(1..1 << 64)
+          value = rand(1..(1 << 64))
           put :update, params: { id: lookup_key.id, smart_class_parameter: { override: true,
                                                                              default_value: value,
                                                                              validator_type: 'regexp',

data/test/controllers/foreman_puppet/environments_controller_test.rb

@@ -107,7 +107,7 @@ module ForemanPuppet
               { 'env3' => '[]' } } }, session: set_session_user
         assert_redirected_to environments_url
         assert_equal 'Successfully updated environments and Puppet classes from the on-disk Puppet installation', flash[:success]
-        assert_equal [], Environment.unscoped.find_by(name: 'env3').puppetclasses.map(&:name).sort
+        assert_empty Environment.unscoped.find_by(name: 'env3').puppetclasses.map(&:name).sort
       end
 
       test 'should fail to remove active environments' do

data/test/controllers/foreman_puppet/hosts_controller_test.rb

@@ -201,7 +201,6 @@ module ForemanPuppet
       test 'hosts with a registered smart proxy on should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['else.where'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
@@ -211,7 +210,6 @@ module ForemanPuppet
       test 'hosts without a registered smart proxy on should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['another.host'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
@@ -221,7 +219,6 @@ module ForemanPuppet
       test 'hosts with a registered smart proxy and SSL cert should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=else.where'
@@ -234,7 +231,6 @@ module ForemanPuppet
       test 'hosts in trusted hosts list and SSL cert should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['else.where']
 
         @request.env['HTTPS'] = 'on'
@@ -248,7 +244,6 @@ module ForemanPuppet
       test 'hosts with comma-separated SSL DN should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['foreman.example']
 
         @request.env['HTTPS'] = 'on'
@@ -262,7 +257,6 @@ module ForemanPuppet
       test 'hosts with slash-separated SSL DN should get externalNodes successfully' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         Setting[:trusted_hosts] = ['foreman.linux.lab.local']
 
         @request.env['HTTPS'] = 'on'
@@ -276,53 +270,37 @@ module ForemanPuppet
       test 'hosts without a registered smart proxy but with an SSL cert should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=another.host'
         @request.env['SSL_CLIENT_VERIFY'] = 'SUCCESS'
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
+        assert_response :forbidden
       end
 
       test 'hosts with an unverified SSL cert should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
 
         @request.env['HTTPS'] = 'on'
         @request.env['SSL_CLIENT_S_DN'] = 'CN=else.where'
         @request.env['SSL_CLIENT_VERIFY'] = 'FAILURE'
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
+        assert_response :forbidden
       end
 
-      test 'when "require_ssl_smart_proxies" and "require_ssl" are true, HTTP requests should not be able to get externalNodes' do
+      test 'when "require_ssl" is true, HTTP requests should not be able to get externalNodes' do
         User.current = nil
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = true
 
         Resolv.any_instance.stubs(:getnames).returns(['else.where'])
         get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_equal 403, @response.status
-      end
-
-      test 'when "require_ssl_smart_proxies" is true and "require_ssl" is false, HTTP requests should be able to get externalNodes' do
-        User.current = nil
-        # since require_ssl_smart_proxies is only applicable to HTTPS connections, both should be set
-        Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
-        SETTINGS[:require_ssl] = false
-
-        Resolv.any_instance.stubs(:getnames).returns(['else.where'])
-        get :externalNodes, params: { name: host1.name, format: 'yml' }
-        assert_response :success
+        assert_response :redirect
       end
 
       test 'authenticated users over HTTP should be able to get externalNodes' do
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['users.host'])
@@ -332,7 +310,6 @@ module ForemanPuppet
 
       test 'authenticated users over HTTPS should be able to get externalNodes' do
         Setting[:restrict_registered_smart_proxies] = true
-        Setting[:require_ssl_smart_proxies] = true
         SETTINGS[:require_ssl] = false
 
         Resolv.any_instance.stubs(:getnames).returns(['users.host'])

data/test/graphql/queries/environment_query_test.rb

@@ -42,10 +42,10 @@ module Queries
     test 'fetching environment attributes' do
       assert_empty result['errors']
 
-      assert_equal global_id, data['id']
-      assert_equal environment.created_at.utc.iso8601, data['createdAt']
-      assert_equal environment.updated_at.utc.iso8601, data['updatedAt']
-      assert_equal environment.name, data['name']
+      expect(data['name']).must_equal(environment.name)
+      expect(data['id']).must_equal(global_id)
+      expect(data['createdAt']).must_equal(environment.created_at.utc.iso8601)
+      expect(data['updatedAt']).must_equal(environment.updated_at.utc.iso8601)
 
       assert_collection environment.locations, data['locations']
       assert_collection environment.organizations, data['organizations']

data/test/graphql/queries/puppetclass_query_test.rb

@@ -55,10 +55,10 @@ module Queries
     test 'fetching puppetclass attributes' do
       assert_empty result['errors']
 
-      assert_equal global_id, data['id']
-      assert_equal puppetclass.created_at.utc.iso8601, data['createdAt']
-      assert_equal puppetclass.updated_at.utc.iso8601, data['updatedAt']
-      assert_equal puppetclass.name, data['name']
+      expect(data['id']).must_equal global_id
+      expect(data['createdAt']).must_equal puppetclass.created_at.utc.iso8601
+      expect(data['updatedAt']).must_equal puppetclass.updated_at.utc.iso8601
+      expect(data['name']).must_equal puppetclass.name
 
       assert_collection puppetclass.environments, data['environments']
       assert_collection puppetclass.locations, data['locations']

data/test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb

@@ -0,0 +1,34 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class PuppetclassLookupKeysHelperTest < ActionView::TestCase
+    include PuppetclassLookupKeysHelper
+
+    describe '#overridable_puppet_lookup_keys' do
+      let(:parent_puppet_var) { FactoryBot.create(:puppetclass_lookup_key) }
+      let(:parent_hg) { FactoryBot.create(:hostgroup, :with_puppet_enc, environment: parent_puppet_var.environments.first) }
+
+      context 'with new hostgroup' do
+        subject do
+          hg = Hostgroup.new(parent: parent_hg)
+          hg.build_puppet
+          hg
+        end
+
+        it 'returns inherited parameter' do
+          keys = overridable_puppet_lookup_keys(parent_puppet_var.param_classes.first, subject)
+          _(keys).must_include(parent_puppet_var)
+        end
+      end
+
+      context 'with new host' do
+        subject { Host.new(hostgroup: parent_hg) }
+
+        it 'returns inherited parameter' do
+          keys = overridable_puppet_lookup_keys(parent_puppet_var.param_classes.first, subject)
+          _(keys).must_include(parent_puppet_var)
+        end
+      end
+    end
+  end
+end

data/test/integration/foreman_puppet/dashboard_js_test.rb

@@ -1,5 +1,4 @@
-require 'test_puppet_helper'
-require 'integration_test_helper'
+require 'integration_puppet_helper'
 require 'integration/shared/host_finders'
 require 'integration/shared/host_orchestration_stubs'
 

data/test/integration/foreman_puppet/environment_js_test.rb

@@ -1,5 +1,4 @@
-require 'test_puppet_helper'
-require 'integration_test_helper'
+require 'integration_puppet_helper'
 
 module ForemanPuppet
   class EnvironmentJSTest < IntegrationTestWithJavascript

data/test/integration/foreman_puppet/host_js_test.rb

@@ -1,5 +1,4 @@
-require 'test_puppet_helper'
-require 'integration_test_helper'
+require 'integration_puppet_helper'
 require 'integration/shared/host_finders'
 require 'integration/shared/host_orchestration_stubs'
 
@@ -61,7 +60,8 @@ module ForemanPuppet
 
         close_interfaces_modal
 
-        click_on_submit
+        click_button('Submit')
+        find('h5', text: /myhost1*/)
 
         host = Host::Managed.search_for('name ~ "myhost1"').first
         assert_equal env2.name, host.puppet.environment.name
@@ -95,8 +95,8 @@ module ForemanPuppet
         fill_in 'host_interfaces_attributes_0_mac', with: '00:11:11:11:11:11'
         fill_in 'host_interfaces_attributes_0_ip', with: '1.1.1.1'
         close_interfaces_modal
-        click_on_submit
-        find('#host-show') # wait for host details page
+        click_button('Submit')
+        find('h5', text: /myhost1*/) # wait for host details page
 
         host = Host::Managed.search_for('name ~ "myhost1"').first
         assert_equal env.name, host.puppet.environment.name
@@ -112,8 +112,9 @@ module ForemanPuppet
         visit edit_host_path(host)
 
         select2 env1.name, from: 'host_puppet_attributes_environment_id'
-        click_on_submit
-        assert_current_path(host_path(host), ignore_query: true)
+        click_button('Submit')
+        find('h5', text: /#{host.name}/)
+        assert_current_path(host_details_page_path(host), ignore_query: true)
 
         host.reload
         assert_equal env1.name, host.puppet.environment.name
@@ -202,7 +203,8 @@ module ForemanPuppet
           assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :hidden)
           assert_equal('false', find("#s2id_host_lookup_values_attributes_#{lookup_key.id}_value .select2-chosen").text)
           select2 'true', from: "host_lookup_values_attributes_#{lookup_key.id}_value"
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
@@ -214,25 +216,27 @@ module ForemanPuppet
                                                      puppetclass: host.puppet.puppetclasses.first, overrides: { host.lookup_value_matcher => 'hostOverride' })
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
-          assert_equal('hostOverride', puppetclass_params.find('textarea').value)
+          expect(puppetclass_params.find('textarea').value).must_equal('hostOverride')
           assert puppetclass_params.find('textarea:enabled')
           puppetclass_params.find("a[data-tag='remove']").click
           assert puppetclass_params.find('textarea:disabled')
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
-          assert_equal('default', puppetclass_params.find('textarea').value)
-          assert puppetclass_params.find('textarea:disabled')
+          expect(puppetclass_params.find('textarea').value).must_equal('default')
+          expect(puppetclass_params).must_have_selector('textarea:disabled')
           puppetclass_params.find("a[data-tag='override']").click
-          assert puppetclass_params.find('textarea:enabled')
+          expect(puppetclass_params).must_have_selector('textarea:enabled')
           puppetclass_params.find('textarea').set('userCustom')
-          click_on_submit
+          click_button('Submit')
+          find('h5', text: /#{host.name}/)
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
-          assert_equal('userCustom', puppetclass_params.find('textarea').value)
-          assert puppetclass_params.find('textarea:enabled')
+          expect(puppetclass_params.find('textarea').value).must_equal('userCustom')
+          expect(puppetclass_params).must_have_selector('textarea:enabled')
         end
 
         test 'can override puppetclass lookup values' do
@@ -241,22 +245,22 @@ module ForemanPuppet
 
           visit edit_host_path(host)
           switch_form_tab('Puppet ENC')
-          assert puppetclass_params.has_selector?("a[data-tag='remove']", visible: :visible)
-          assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :hidden)
-          assert_equal('hostOverride', puppetclass_params.find('textarea').value)
-          assert puppetclass_params.find('textarea:enabled')
+          expect(puppetclass_params).must_have_selector("a[data-tag='remove']", visible: :visible)
+          expect(puppetclass_params).must_have_selector("a[data-tag='override']", visible: :hidden)
+          expect(puppetclass_params.find('textarea').value).must_equal('hostOverride')
+          expect(puppetclass_params).must_have_selector('textarea:enabled')
 
           puppetclass_params.find("a[data-tag='remove']").click
-          assert puppetclass_params.has_selector?("a[data-tag='remove']", visible: :hidden)
-          assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :visible)
+          expect(puppetclass_params).must_have_selector("a[data-tag='remove']", visible: :hidden)
+          expect(puppetclass_params).must_have_selector("a[data-tag='override']", visible: :visible)
           assert_equal('default', puppetclass_params.find('textarea').value)
           assert puppetclass_params.find('textarea:disabled')
 
           puppetclass_params.find("a[data-tag='override']").click
-          assert puppetclass_params.has_selector?("a[data-tag='remove']", visible: :visible)
-          assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :hidden)
-          assert_equal('default', puppetclass_params.find('textarea').value)
-          assert puppetclass_params.find('textarea:enabled')
+          expect(puppetclass_params).must_have_selector("a[data-tag='remove']", visible: :visible)
+          expect(puppetclass_params).must_have_selector("a[data-tag='override']", visible: :hidden)
+          expect(puppetclass_params.find('textarea').value).must_equal('default')
+          expect(puppetclass_params).must_have_selector('textarea:enabled')
         end
 
         context 'with non-admin user' do
@@ -272,7 +276,7 @@ module ForemanPuppet
             switch_form_tab('Puppet ENC')
             assert puppetclass_params.find('textarea').disabled?
             click_button('Submit')
-            assert page.has_link?('Edit')
+            find('h5', text: /#{host.name}/)
           end
         end
 

data/test/integration/foreman_puppet/hostgroup_js_test.rb

@@ -1,5 +1,4 @@
-require 'test_puppet_helper'
-require 'integration_test_helper'
+require 'integration_puppet_helper'
 
 module ForemanPuppet
   class HostgroupJSTest < IntegrationTestWithJavascript

data/test/integration/foreman_puppet/puppetclass_js_test.rb

@@ -1,5 +1,4 @@
-require 'test_puppet_helper'
-require 'integration_test_helper'
+require 'integration_puppet_helper'
 
 module ForemanPuppet
   class PuppetclassJsTest < IntegrationTestWithJavascript

data/test/integration/foreman_puppet/smartclass_parameter_js_test.rb

@@ -1,5 +1,4 @@
-require_relative '../../test_puppet_helper'
-require 'integration_test_helper'
+require 'integration_puppet_helper'
 
 module ForemanPuppet
   class SmartclassParameterJSTest < IntegrationTestWithJavascript

data/test/integration_puppet_helper.rb

@@ -0,0 +1,3 @@
+require 'test_puppet_helper'
+require 'integration_test_helper'
+require 'capybara/minitest/spec'

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -53,6 +53,17 @@ module ForemanPuppet
       end
     end
 
+    describe '#puppetclass_ids=' do
+      test 'allows empting classes' do
+        host = FactoryBot.create(:host, :with_puppet_enc,
+          environment: environment,
+          puppetclasses: [puppetclass_both])
+        host.attributes = { puppet_attributes: { puppetclass_ids: [] } }
+        assert host.save, 'Host could not be saved after updating puppetclasses'
+        assert_empty host.reload.all_puppetclasses, 'Puppetclasses were not removed successfuly'
+      end
+    end
+
     describe '#all_puppetclasses' do
       test 'should return all classes for environment only' do
         host = FactoryBot.create(:host, :with_puppet_enc,
@@ -107,13 +118,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_equal [], host.puppet.parent_config_groups
+        assert_empty 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
+        assert_empty host.puppet.parent_config_groups
       end
     end
 

data/test/models/foreman_puppet/host_test.rb

@@ -4,13 +4,13 @@ module ForemanPuppet
   class HostTest < ActiveSupport::TestCase
     test 'should read the Puppetserver URL from its proxy settings' do
       host = FactoryBot.build_stubbed(:host)
-      assert_nil host.puppet_server_uri
-      assert_empty host.puppetmaster
+      expect(host.puppet_server_uri).must_be_nil
+      expect(host.puppetmaster).must_be_empty
 
       proxy = FactoryBot.create(:puppet_smart_proxy, url: 'https://smartproxy.example.com:8443')
       host.puppet_proxy = proxy
-      assert_equal 'https://smartproxy.example.com:8140', host.puppet_server_uri.to_s
-      assert_equal 'smartproxy.example.com', host.puppetmaster
+      expect(host.puppet_server_uri.to_s).must_equal 'https://smartproxy.example.com:8140'
+      expect(host.puppetmaster).must_equal 'smartproxy.example.com'
 
       features = {
         'puppet' => {
@@ -18,8 +18,8 @@ module ForemanPuppet
         },
       }
       SmartProxyFeature.import_features(proxy, features)
-      assert_equal 'https://puppet.example.com:8140', host.puppet_server_uri.to_s
-      assert_equal 'puppet.example.com', host.puppetmaster
+      expect(host.puppet_server_uri.to_s).must_equal 'https://puppet.example.com:8140'
+      expect(host.puppetmaster).must_equal 'puppet.example.com'
     end
 
     test 'should find smart proxy ids' do
@@ -141,12 +141,12 @@ module ForemanPuppet
         host = FactoryBot.create(:host, :with_puppet_enc, :with_config_group, :with_puppetclass, :with_parameter,
           hostgroup: hostgroup, environment: hostgroup.puppet.environment)
         copy = host.clone
-        assert_equal host.puppet.individual_puppetclasses.map(&:id), copy.puppet.individual_puppetclasses.map(&:id)
-        assert_equal host.puppet.classes_in_groups.map(&:id), copy.puppet.classes_in_groups.map(&:id)
-        assert_equal host.puppet.classes.map(&:id), copy.puppet.classes.map(&:id)
-        assert_equal host.puppet.available_puppetclasses.map(&:id), copy.puppet.available_puppetclasses.map(&:id)
-        assert_equal host.puppet.host_classes.map(&:puppetclass_id), copy.puppet.host_classes.map(&:puppetclass_id)
-        assert_equal host.puppet.host_config_groups.map(&:config_group_id), copy.puppet.host_config_groups.map(&:config_group_id)
+        expect(copy.puppet.individual_puppetclasses.map(&:id)).must_equal(host.puppet.individual_puppetclasses.map(&:id))
+        expect(copy.puppet.classes_in_groups.map(&:id)).must_equal(host.puppet.classes_in_groups.map(&:id))
+        expect(copy.puppet.classes.map(&:id)).must_equal(host.puppet.classes.map(&:id))
+        expect(copy.puppet.available_puppetclasses.map(&:id)).must_equal(host.puppet.available_puppetclasses.map(&:id))
+        expect(copy.puppet.host_classes.map(&:puppetclass_id)).must_equal(host.puppet.host_classes.map(&:puppetclass_id))
+        expect(copy.puppet.host_config_groups.map(&:config_group_id)).must_equal(host.puppet.host_config_groups.map(&:config_group_id))
       end
     end
 
@@ -232,20 +232,20 @@ module ForemanPuppet
       nodeinfo['parameters']['special_info'] = 'secret' # smart variable on apache
 
       info = host.info
-      assert_includes info.keys, 'environment'
-      assert_equal env.name, host.puppet.environment.name
-      assert_includes info.keys, 'parameters'
-      assert_includes info.keys, 'classes'
+      expect(host.puppet.environment.name).must_equal(env.name)
+      expect(info.keys).must_include 'environment'
+      expect(info.keys).must_include 'parameters'
+      expect(info.keys).must_include 'classes'
       # This worked in core, but it's beyond me how could have :shrug:
       # assert_equal(classes_params, info['classes'])
       # We are only importing classes in the method
-      assert_equal(classes_params.keys.sort, info['classes'].keys.sort)
+      expect(info['classes'].keys.sort).must_equal(classes_params.keys.sort)
       parameters = info['parameters']
-      assert_equal 'puppet', parameters['puppetmaster']
-      assert_equal 'xybxa6JUkz63w', parameters['root_pw']
-      assert_includes parameters.keys, 'foreman_subnets'
-      assert_includes parameters.keys, 'foreman_interfaces'
-      assert_equal '3.3.4.12', parameters['foreman_interfaces'].first['ip']
+      expect(parameters['puppetmaster']).must_equal 'puppet'
+      expect(parameters['root_pw']).must_equal 'xybxa6JUkz63w'
+      expect(parameters['foreman_interfaces'].first['ip']).must_equal '3.3.4.12'
+      expect(parameters.keys).must_include 'foreman_subnets'
+      expect(parameters.keys).must_include 'foreman_interfaces'
     end
 
     test 'should import from non-parameterized external nodes output' do

data/test/models/foreman_puppet/provisioning_template_test.rb

@@ -32,9 +32,9 @@ module ForemanPuppet
         assert tmplt.save
       end
       assert_nil tmplt.template_kind
-      assert_equal [], tmplt.hostgroups
-      assert_equal [], tmplt.environments
-      assert_equal [], tmplt.template_combinations
+      assert_empty tmplt.hostgroups
+      assert_empty tmplt.environments
+      assert_empty tmplt.template_combinations
     end
 
     test '#template_includes adds environment include' do

data/test/models/foreman_puppet/puppetclass_test.rb

@@ -17,7 +17,7 @@ module ForemanPuppet
     end
 
     test 'looking for a nonexistent host returns no puppetclasses' do
-      assert_equal [], Puppetclass.search_for('host = imaginaryhost.nodomain.what')
+      assert_empty Puppetclass.search_for('host = imaginaryhost.nodomain.what')
     end
 
     test 'Puppetclass singularize from custom inflection' do

data/test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb

@@ -28,7 +28,7 @@ module ForemanPuppet
       end
 
       it 'does not fail without puppet facet' do
-        assert_equal({}, cg_info.host_info)
+        assert_empty(cg_info.host_info)
       end
     end
   end

data/test/services/foreman_puppet/host_info_providers/puppet_info_test.rb

@@ -98,7 +98,7 @@ module ForemanPuppet
         puppetclass: puppetclass)
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
-      assert enc[puppetclass.name][lkey.key].nil?
+      assert_nil enc[puppetclass.name][lkey.key]
     end
 
     test '#enc should not return class parameters when lookup_value should use puppet default' do
@@ -113,7 +113,7 @@ module ForemanPuppet
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
-      assert enc[puppetclass.name][lkey.key].nil?
+      assert_nil enc[puppetclass.name][lkey.key]
     end
 
     test '#enc should return class parameters when default value and lookup_values should not use puppet default' do
@@ -160,7 +160,7 @@ module ForemanPuppet
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
-      assert enc[puppetclass.name][key.key].nil?
+      assert_nil enc[puppetclass.name][key.key]
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited hostgroups exist' do

data/test/unit/foreman_puppet/template_rendering_test.rb

@@ -3,7 +3,7 @@ require 'test_puppet_helper'
 module ForemanPuppet
   class TemplateRenderingTest < ActiveSupport::TestCase
     let(:host) { FactoryBot.build_stubbed(:host, :with_puppet_enc) }
-    let(:template) { OpenStruct.new(name: 'Test', template: 'Test') }
+    let(:template) { stub(name: 'Test', template: 'Test') }
     let(:source) { Foreman::Renderer::Source::Database.new(template) }
     let(:scope) do
       Class.new(Foreman::Renderer::Scope::Base) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.2
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Allow assigning Puppet environments and classes to the Foreman Hosts.
 email:
@@ -188,6 +188,8 @@ files:
 - db/migrate/20210924103241_remove_katello_id_from_environments.foreman_puppet.rb
 - db/migrate/20211111125003_drop_puppetclasses_direct_references.foreman_puppet.rb
 - db/migrate/20211112130803_cleanup_environment_from_core_tables.foreman_puppet.rb
+- db/migrate/20220201205305_migrate_host_class_permission.foreman_puppet.rb
+- db/migrate/20220208135305_migrate_environment_ignore_type.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
@@ -292,6 +294,7 @@ files:
 - test/graphql/queries/puppetclass_query_test.rb
 - test/graphql/queries/puppetclasses_query_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_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
@@ -299,6 +302,7 @@ files:
 - test/integration/foreman_puppet/hostgroup_js_test.rb
 - test/integration/foreman_puppet/puppetclass_js_test.rb
 - test/integration/foreman_puppet/smartclass_parameter_js_test.rb
+- test/integration_puppet_helper.rb
 - test/models/foreman_puppet/config_group_class_test.rb
 - test/models/foreman_puppet/config_group_test.rb
 - test/models/foreman_puppet/environment_test.rb
@@ -363,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Add Puppet features to Foreman
@@ -387,6 +391,8 @@ test_files:
 - test/graphql/queries/environment_query_test.rb
 - test/graphql/queries/hostgroup_puppet_query_test.rb
 - test/graphql/queries/environments_query_test.rb
+- test/integration_puppet_helper.rb
+- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
 - test/helpers/foreman_puppet/puppetclasses_helper_test.rb
 - test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
 - test/models/foreman_puppet/config_group_class_test.rb