foreman_puppet 2.0.3 → 3.0.3

data/locale/zh_TW/foreman_puppet.po

@@ -8,10 +8,9 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
+"Project-Id-Version: foreman_puppet 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2021\n"
@@ -89,6 +88,9 @@ msgstr "所有環境 -（未篩選）"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
+msgid "Autosign entries"
+msgstr ""
+
 msgid "Available Classes"
 msgstr "可用類別"
 
@@ -104,6 +106,9 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
+msgid "Certificates"
+msgstr ""
+
 msgid "Change Environment"
 msgstr "更改環境"
 
@@ -341,6 +346,9 @@ msgstr ""
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "若為真而沒有預設值並且比對器未提供值的話，將會造成錯誤發生。"
 
+msgid "If you are planning to use Foreman as an external node classifier you should provide information about one or more environments.<br/> This information is commonly imported from a pre-existing Puppet configuration by the use of the <a target=\"_blank\" href=${getManualURL( '4.2.2Classes' )}>Puppet classes and environment importer.</a>"
+msgstr ""
+
 msgid "Ignored classes in the environments: %s"
 msgstr ""
 
@@ -677,6 +685,9 @@ msgstr "智慧類別參數"
 msgid "Smart Class Parameters"
 msgstr ""
 
+msgid "Some Puppet Classes are unavailable in the selected environment"
+msgstr ""
+
 msgid "Successfully overridden all parameters of Puppet class %s"
 msgstr "已成功置換 Puppet 類別 %s 的所有參數"
 

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/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