foreman_puppet 2.0.7 → 3.0.1

data/locale/nl_NL/foreman_puppet.po

@@ -10,9 +10,10 @@
 # dschutterop <daniel@schutterop.nl>, 2021
 # Mark Olie <mark.transifex@oliekoets.nl>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Mark Olie <mark.transifex@oliekoets.nl>, 2021\n"
@@ -90,9 +91,6 @@ msgstr ""
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "Beschikbare Classes"
 
@@ -108,9 +106,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annuleren"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "Wijzig Omgeving"
 
@@ -348,9 +343,6 @@ msgstr ""
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "Als gezet, wordt er een fout gegenereerd als er geen standaardwaarde is en geen matcher een waarde aanbiedt"
 
-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 "Genegeerde classes in de omgevingen: %s"
 
@@ -687,9 +679,6 @@ 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 "Alle parameters van puppet class %s zijn succesvol overridden."
 

data/locale/pl/foreman_puppet.po

@@ -8,9 +8,10 @@
 # sziolkow <sziolkow@gmail.com>, 2021
 # Michał Foryt <michal.foryt@gmail.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Michał Foryt <michal.foryt@gmail.com>, 2021\n"
@@ -89,9 +90,6 @@ msgstr "Wszystkie środowiska - (nie filtrowane)"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "Dostępne klasy"
 
@@ -107,9 +105,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Anuluj"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "Zmień środowisko"
 
@@ -347,9 +342,6 @@ msgstr ""
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "Jeśli to prawda, zgłosi błąd, jeśli nie ma wartości domyślnej ani podanej dopasowanej wartości"
 
-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 ""
 
@@ -686,9 +678,6 @@ msgstr "Parametr inteligentnej klasy"
 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 "Pomyślnie nadpisano wszystkie parametry klasy Puppet %s"
 

data/locale/pt_BR/foreman_puppet.po

@@ -13,9 +13,10 @@
 # Felipe Nogaroto Gonzalez <felipeng84@gmail.com>, 2021
 # Amit Upadhye <aupadhye@redhat.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2021\n"
@@ -93,9 +94,6 @@ msgstr "Todos os ambientes - (sem filtro)"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "Classes disponíveis"
 
@@ -111,9 +109,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "Mudar ambiente"
 
@@ -351,9 +346,6 @@ msgstr ""
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "Se verdadeiro, gerará um erro caso não exista nenhum valor padrão e nenhuma correspondência forneça um valor "
 
-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 "Classes ignoradas nos ambientes: %s"
 
@@ -690,9 +682,6 @@ msgstr "Parâmetro de Classe Inteligente"
 msgid "Smart Class Parameters"
 msgstr "Parâmetros de classe inteligentes"
 
-msgid "Some Puppet Classes are unavailable in the selected environment"
-msgstr ""
-
 msgid "Successfully overridden all parameters of Puppet class %s"
 msgstr "Todos os parâmetros da Classe Puppet foram sobrescritos com sucesso %s"
 

data/locale/ru/foreman_puppet.po

@@ -11,14 +11,15 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 # Vladimir Pavlov <v.pavlov@i-teco.ru>, 2021
-# KotUchoniy <yosho1@yandex.ru>, 2021
+# Pavel Ershov <yosho1@yandex.ru>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
-"Last-Translator: KotUchoniy <yosho1@yandex.ru>, 2021\n"
+"Last-Translator: Pavel Ershov <yosho1@yandex.ru>, 2021\n"
 "Language-Team: Russian (https://www.transifex.com/foreman/teams/114/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,9 +95,6 @@ msgstr "Все окружения (без фильтра)"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "Доступные классы"
 
@@ -112,9 +110,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Отмена"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "Изменить окружение"
 
@@ -352,9 +347,6 @@ 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 ""
 
@@ -691,9 +683,6 @@ 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/locale/sv_SE/foreman_puppet.po

@@ -9,9 +9,10 @@
 # Mikael Fridh <frimik@gmail.com>, 2021
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>, 2021\n"
@@ -89,9 +90,6 @@ msgstr ""
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "Tillgängliga Klasser"
 
@@ -107,9 +105,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Avbryt"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "Byt Miljö"
 
@@ -347,9 +342,6 @@ 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 ""
 
@@ -686,9 +678,6 @@ msgstr "Smart Klassparameter"
 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 ""
 

data/locale/zh_CN/foreman_puppet.po

@@ -10,9 +10,10 @@
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 # Amit Upadhye <aupadhye@redhat.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-02-03 16:30+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2021\n"
@@ -93,9 +94,6 @@ msgstr "所有环境 - （未过滤）"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "可用类"
 
@@ -111,9 +109,6 @@ msgstr "找不到具有 Puppet 功能的有效代理"
 msgid "Cancel"
 msgstr "取消"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "改变环境"
 
@@ -322,7 +317,7 @@ msgid "ID of Puppet class"
 msgstr "Puppet 类别 ID"
 
 msgid "ID of Puppet environment"
-msgstr "Puppet 环境的 ID"
+msgstr ""
 
 msgid "ID of Puppetclass"
 msgstr "Puppetclass ID"
@@ -331,7 +326,7 @@ msgid "ID of associated puppet Environment"
 msgstr "与 puppet 环境关联的 ID"
 
 msgid "ID of environment"
-msgstr "环境 ID"
+msgstr "环境的 ID"
 
 msgid "ID of host"
 msgstr "主機的 ID"
@@ -351,9 +346,6 @@ msgstr "与 Puppetclasses 关联的 ID"
 msgid "If true, will raise an error if there is no default value and no matcher provide a value"
 msgstr "如为 true，则会在没有默认值且没有匹配程序提供参数值时出错"
 
-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 "环境中忽略的类别： %s"
 
@@ -690,9 +682,6 @@ 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 的所有参数"
 
@@ -725,7 +714,7 @@ msgid "The order in which values are resolved"
 msgstr "值解析的順序"
 
 msgid "The requested environment cannot be found."
-msgstr "无法找到请求的环境。"
+msgstr ""
 
 msgid "There are no puppet environments set up on this puppet master. Please check the puppet master configuration."
 msgstr "这台 puppet 主服务器中未设置任何 puppet 环境。请检查 puppet 主服务器配置。"

data/locale/zh_TW/foreman_puppet.po

@@ -8,9 +8,10 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
 # Bryan Kearney <bryan.kearney@gmail.com>, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_puppet 3.0.2\n"
+"Project-Id-Version: foreman_puppet 2.0.0.alpha.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"
@@ -88,9 +89,6 @@ msgstr "所有環境 -（未篩選）"
 msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
 msgstr ""
 
-msgid "Autosign entries"
-msgstr ""
-
 msgid "Available Classes"
 msgstr "可用類別"
 
@@ -106,9 +104,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-msgid "Certificates"
-msgstr ""
-
 msgid "Change Environment"
 msgstr "更改環境"
 
@@ -346,9 +341,6 @@ 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 ""
 
@@ -685,9 +677,6 @@ 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/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/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'
 
@@ -214,7 +213,7 @@ 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')
@@ -222,17 +221,17 @@ module ForemanPuppet
 
           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
 
           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 +240,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

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'