foreman_puppet 0.0.2 → 1.0.0

data/test/models/foreman_puppet/environment_test.rb

@@ -2,6 +2,8 @@ require 'test_puppet_helper'
 
 module ForemanPuppet
   class EnvironmentTest < ActiveSupport::TestCase
+    setup { FactoryBot.create(:environment) }
+
     should validate_presence_of(:name)
     should validate_uniqueness_of(:name)
     should have_many(:provisioning_templates).through(:template_combinations)

data/test/models/foreman_puppet/host_puppet_facet_test.rb

@@ -1,13 +1,46 @@
 require 'test_puppet_helper'
 
 module ForemanPuppet
-  class HostgroupPuppetFacetTest < ActiveSupport::TestCase
+  class HostPuppetFacetTest < ActiveSupport::TestCase
     let(:environment) { FactoryBot.create(:environment) }
     let(:diff_environment) { FactoryBot.create(:environment) }
     let(:puppetclass_both) { FactoryBot.create(:puppetclass, environments: [environment, diff_environment]) }
     let(:config_group) { FactoryBot.create(:config_group, :with_puppetclass, class_environments: [environment]) }
     let(:config_group_diff_env) { FactoryBot.create(:config_group, :with_puppetclass, class_environments: [diff_environment]) }
 
+    describe '.populate_fields_from_facts' do
+      test 'populate environment without any puppet info' do
+        h = FactoryBot.create(:host)
+        parser = stub(environment: environment)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_equal environment, h.puppet.environment
+      end
+
+      test 'changes puppet environment when setting says to do so' do
+        Setting[:update_environment_from_facts] = true
+        h = FactoryBot.create(:host, :with_puppet_enc)
+        parser = stub(environment: environment)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_equal environment, h.puppet.environment
+      end
+
+      test 'keep puppet environment when parser has empty environment' do
+        Setting[:update_environment_from_facts] = true
+        h = FactoryBot.create(:host, :with_puppet_enc)
+        parser = stub(environment: nil)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_not_nil h.puppet.environment
+      end
+
+      test 'do not update puppet environment when setting says not to' do
+        Setting[:update_environment_from_facts] = false
+        h = FactoryBot.create(:host, :with_puppet_enc)
+        parser = stub(environment: environment)
+        HostPuppetFacet.populate_fields_from_facts(h, parser, 'puppet', FactoryBot.create(:puppet_smart_proxy))
+        assert_not_equal environment, h.puppet.environment
+      end
+    end
+
     describe '#classes_in_groups' do
       test 'classes_in_groups should return the puppetclasses of a config group only if it is in host environment' do
         host = FactoryBot.create(:host, :with_puppet_enc,

data/test/models/foreman_puppet/host_test.rb

@@ -79,7 +79,7 @@ module ForemanPuppet
 
       test 'can search hosts by puppet class from config group in parent hostgroup' do
         hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc)
-        host = FactoryBot.create(:host, :with_puppet_enc, hostgroup: hostgroup, environment: hostgroup.environment)
+        host = FactoryBot.create(:host, :with_puppet_enc, hostgroup: hostgroup, environment: hostgroup.puppet.environment)
         config_group = FactoryBot.create(:config_group, :with_puppetclass)
         hostgroup.puppet.config_groups << config_group
         result = Host.search_for("class = #{config_group.puppetclass_names.first}")
@@ -138,7 +138,8 @@ module ForemanPuppet
     describe '#clone' do
       test '#classes etc. on cloned host return the same' do
         hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_config_group, :with_puppetclass)
-        host = FactoryBot.create(:host, :with_puppet_enc, :with_config_group, :with_puppetclass, :with_parameter, hostgroup: hostgroup, environment: hostgroup.environment)
+        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)
@@ -241,7 +242,7 @@ module ForemanPuppet
 
       host.puppet.environment = env_with_other_tax
       assert_not host.valid?
-      assert_match(/is not assigned/, host.errors[:environment_id].first)
+      assert_match(/is not assigned/, host.errors['puppet.environment_id'].first)
     end
 
     test 'when saving a host, require puppet environment if puppet master is set' do

data/test/models/foreman_puppet/hostgroup_puppet_facet_test.rb

@@ -22,15 +22,14 @@ module ForemanPuppet
     end
 
     test 'changing environment should preserve puppetclasses' do
-      skip 'Something fishy on env update, try once extracted' unless ForemanPuppet.extracted_from_core?
       new_environment = FactoryBot.create(:environment)
-      old_puppetclass_ids = hostgroup.puppet.puppetclass_ids
+      old_puppetclass_ids = hostgroup.puppet.puppetclasses.all
 
       hostgroup.puppet.update!(environment: new_environment)
       hostgroup.reload
 
       assert_equal new_environment, hostgroup.puppet.environment
-      assert_equal old_puppetclass_ids.sort, hostgroup.puppet.puppetclass_ids.sort
+      assert_equal old_puppetclass_ids.sort, hostgroup.puppet.puppetclasses.all
     end
 
     test 'should return all classes for environment only' do

data/test/models/foreman_puppet/provisioning_template_test.rb

@@ -37,7 +37,14 @@ module ForemanPuppet
       assert_equal [], tmplt.template_combinations
     end
 
-    describe 'Association cascading' do
+    test '#template_includes adds environment include' do
+      includes = ProvisioningTemplate.template_includes
+      tc_include = includes.detect { |i| i.is_a?(Hash) && i.key?(:template_combinations) }
+      assert tc_include
+      assert_includes tc_include[:template_combinations], :environment
+    end
+
+    describe '#find_template by template_combinations' do
       setup do
         @arch = FactoryBot.create(:architecture)
         medium = FactoryBot.create(:medium, name: 'combo_medium', path: 'http://www.example.com/m')
@@ -74,7 +81,7 @@ module ForemanPuppet
         @ctd.os_default_templates.create(operatingsystem: @os1, template_kind_id: @ctd.template_kind_id)
       end
 
-      test 'find_template finds a matching template with hg and env' do
+      test 'finds a matching template with hg and env' do
         assert_equal @ct1.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
                                                operatingsystem_id: @os1.id,
@@ -82,14 +89,14 @@ module ForemanPuppet
                                                environment_id: @ev1.id }).name
       end
 
-      test 'find_template finds a matching template with hg only' do
+      test 'finds a matching template with hg only' do
         assert_equal @ct2.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
                                                operatingsystem_id: @os1.id,
                                                hostgroup_id: @hg1.id }).name
       end
 
-      test 'find_template finds a matching template with hg and mismatched env' do
+      test 'finds a matching template with hg and mismatched env' do
         assert_equal @ct2.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
                                                operatingsystem_id: @os1.id,
@@ -97,14 +104,14 @@ module ForemanPuppet
                                                environment_id: @ev3.id }).name
       end
 
-      test 'find_template finds a matching template with env only' do
+      test 'finds a matching template with env only' do
         assert_equal @ct3.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
                                                operatingsystem_id: @os1.id,
                                                environment_id: @ev1.id }).name
       end
 
-      test 'find_template finds a matching template with env and mismatched hg' do
+      test 'finds a matching template with env and mismatched hg' do
         assert_equal @ct3.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
                                                operatingsystem_id: @os1.id,
@@ -112,7 +119,7 @@ module ForemanPuppet
                                                environment_id: @ev1.id }).name
       end
 
-      test 'find_template finds the default template when hg and env do not match' do
+      test 'finds the default template when hg and env do not match' do
         assert_equal @ctd.name,
           ProvisioningTemplate.find_template({ kind: @tk.name,
                                                operatingsystem_id: @os1.id,

data/test/models/foreman_puppet/report_test.rb

@@ -0,0 +1,21 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class TestReport < ::Report
+  end
+
+  class ReportTest < ActiveSupport::TestCase
+    test 'Inherited children can search by environment' do
+      assert_nothing_raised do
+        TestReport.search_for('environment = blah')
+      end
+    end
+
+    # to include the environment search
+    test 'Inherited children can search' do
+      assert_nothing_raised do
+        TestReport.search_for('blah')
+      end
+    end
+  end
+end

data/test/models/foreman_puppet/smart_proxy_test.rb

@@ -17,7 +17,7 @@ module ForemanPuppet
       end
 
       test 'can count connected hosts' do
-        FactoryBot.create(:host, :with_puppet_enc, :with_environment, puppet_proxy: proxy)
+        FactoryBot.create(:host, :with_puppet_enc, puppet_proxy: proxy)
 
         as_admin do
           assert_equal 1, proxy.hosts_count

data/test/models/foreman_puppet/user_test.rb

@@ -0,0 +1,37 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class UserTest < ActiveSupport::TestCase
+    describe '#visible_environments' do
+      let(:environment) { FactoryBot.create(:environment) }
+      let(:untaxed_env) { FactoryBot.create(:environment, organizations: [], locations: []) }
+      let(:env_names) do
+        env_names = [environment.name, untaxed_env.name]
+        env_names += %w[production global_puppetmaster testing] unless ForemanPuppet.extracted_from_core?
+        env_names
+      end
+
+      setup do
+        environment
+        untaxed_env
+      end
+
+      # These will need refactor when the environment fixtures will be gone
+      test 'should show the list of environments visible as admin user' do
+        # Admin user sees all environments - including the ones without taxonomies\
+        assert_equal env_names.sort, ::User.current.visible_environments.sort
+      end
+
+      test 'should show the list of environments visible as inherited admin user' do
+        ::User.current = FactoryBot.create(:user, usergroups: [FactoryBot.create(:usergroup, admin: true)]).reload
+        assert_same_elements env_names.sort, ::User.current.visible_environments
+      end
+
+      test 'should show the list of environments visible as non-admin user' do
+        # Non-admin user only sees environments in a taxonomy at least
+        setup_user 'view', 'environments'
+        assert_equal [environment.name], ::User.current.visible_environments
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'test_puppet_helper'
+
+module ForemanPuppet
+  class ConfigGroupInfoTest < ActiveSupport::TestCase
+    let(:cg_info) { HostInfoProviders::ConfigGroupsInfo.new(host) }
+
+    context 'with Puppet Host' do
+      let(:config_group) { FactoryBot.create(:config_group) }
+      let(:host) do
+        FactoryBot.build(:host, :with_puppet_enc,
+          location: taxonomies(:location1),
+          organization: taxonomies(:organization1),
+          operatingsystem: operatingsystems(:redhat),
+          config_groups: [config_group])
+      end
+
+      it 'adds config_groups to host parameters' do
+        assert_equal([config_group.name], cg_info.host_info['parameters']['foreman_config_groups'])
+      end
+    end
+
+    context 'without Puppet' do
+      let(:host) do
+        FactoryBot.build(:host,
+          location: taxonomies(:location1),
+          organization: taxonomies(:organization1),
+          operatingsystem: operatingsystems(:redhat))
+      end
+
+      it 'does not fail without puppet facet' do
+        assert_equal({}, cg_info.host_info)
+      end
+    end
+  end
+end

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

@@ -37,9 +37,9 @@ module ForemanPuppet
 
       value = as_admin do
         LookupValue.create! lookup_key_id: puppetclass_lookup_key.id,
-                            match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
-                            value: 'test',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
+          value: 'test',
+          omit: false
       end
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
@@ -78,19 +78,17 @@ module ForemanPuppet
       host = FactoryBot.build_stubbed(:host, :with_puppet_enc, environment: environment, puppetclasses: [puppetclass])
       Classification::MatchesGenerator.any_instance.expects(:attr_to_value).with('comment').returns('override')
 
-      assert_equal(
-        {
-          lkey.id => {
-            lkey.key => {
-              value: 'overridden value',
-              element: 'comment',
-              element_name: 'override',
-              managed: false,
-            },
+      expected = {
+        lkey.id => {
+          lkey.key => {
+            value: 'overridden value',
+            element: 'comment',
+            element_name: 'override',
+            managed: false,
           },
         },
-        Classification::ValuesHashQuery.values_hash(host, LookupKey.where(id: [lkey])).raw
-      )
+      }
+      assert_equal(expected, Classification::ValuesHashQuery.values_hash(host, LookupKey.where(id: [lkey])).raw)
 
       Classification::MatchesGenerator.any_instance.unstub(:attr_to_value)
     end
@@ -108,9 +106,9 @@ module ForemanPuppet
         puppetclass: puppetclass, path: "location\ncomment")
       as_admin do
         LookupValue.create! lookup_key_id: lkey.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'test',
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: 'test',
+          omit: true
       end
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
@@ -124,9 +122,9 @@ module ForemanPuppet
                                                                         path: "location\ncomment")
       lvalue = as_admin do
         LookupValue.create! lookup_key_id: lkey.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'test',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'test',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
@@ -142,22 +140,22 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: { example: { a: 'test' } },
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: { example: { a: 'test' } },
+          omit: true
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: { example: { b: 'test2' } },
-                            omit: true
+          match: "organization=#{taxonomies(:organization1)}",
+          value: { example: { b: 'test2' } },
+          omit: true
       end
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "os=#{operatingsystems(:redhat)}",
-                            value: { example: { a: 'test3' } },
-                            omit: true
+          match: "os=#{operatingsystems(:redhat)}",
+          value: { example: { a: 'test3' } },
+          omit: true
       end
 
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
@@ -166,9 +164,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited hostgroups exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        key_type: 'array', merge_overrides: true,
                                                        path: "organization\nhostgroup\nlocation",
@@ -184,13 +179,13 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: ['parent'],
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -199,9 +194,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited organizations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        key_type: 'array', merge_overrides: true,
                                                        path: "location\norganization\nhostgroup",
@@ -218,13 +210,13 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: ['parent'],
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: ['loc'],
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: ['loc'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -233,9 +225,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited locations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        key_type: 'array', merge_overrides: true,
                                                        path: "organization\nhostgroup\nlocation",
@@ -252,13 +241,13 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: ['parent'],
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -267,9 +256,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited hostgroups exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        key_type: 'array', merge_overrides: true,
                                                        path: "organization\nhostgroup\nlocation",
@@ -285,17 +271,17 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: ['parent'],
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup}",
-                            value: ['child'],
-                            omit: false
+          match: "hostgroup=#{child_hostgroup}",
+          value: ['child'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -304,9 +290,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited organizations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        key_type: 'array', merge_overrides: true,
                                                        path: "location\norganization\nhostgroup",
@@ -323,17 +306,17 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: ['parent'],
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{child_org}",
-                            value: ['child'],
-                            omit: false
+          match: "organization=#{child_org}",
+          value: ['child'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: ['loc'],
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: ['loc'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -342,9 +325,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct merged override to host when multiple overrides for inherited locations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        key_type: 'array', merge_overrides: true,
                                                        path: "organization\nhostgroup\nlocation",
@@ -361,17 +341,17 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: ['parent'],
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: ['parent'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{child_loc}",
-                            value: ['child'],
-                            omit: false
+          match: "location=#{child_loc}",
+          value: ['child'],
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: ['org'],
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: ['org'],
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -380,9 +360,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct override to host when multiple overrides for inherited hostgroups exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        merge_overrides: false,
                                                        path: "organization\nhostgroup\nlocation",
@@ -398,17 +375,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: 'parent',
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup}",
-                            value: 'child',
-                            omit: false
+          match: "hostgroup=#{child_hostgroup}",
+          value: 'child',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'org',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'org',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -417,9 +394,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct override to host when multiple overrides for inherited organizations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        merge_overrides: false,
                                                        path: "location\norganization\nhostgroup",
@@ -434,17 +408,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: 'parent',
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{child_org}",
-                            value: 'child',
-                            omit: false
+          match: "organization=#{child_org}",
+          value: 'child',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -453,9 +427,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct override to host when multiple overrides for inherited locations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        merge_overrides: false,
                                                        path: "organization\nlocation\nhostgroup",
@@ -470,17 +441,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: 'parent',
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{child_loc}",
-                            value: 'child',
-                            omit: false
+          match: "location=#{child_loc}",
+          value: 'child',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'org',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'org',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -489,9 +460,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct override to host when multiple overrides for inherited hostgroups exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        merge_overrides: false,
                                                        path: "organization\nhostgroup\nlocation",
@@ -506,17 +474,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup}",
-                            value: 'parent',
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: true
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup}",
-                            value: 'child',
-                            omit: false
+          match: "hostgroup=#{child_hostgroup}",
+          value: 'child',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -525,9 +493,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct override to host when multiple overrides for inherited organizations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        merge_overrides: false,
                                                        path: "organization\nhostgroup\nlocation",
@@ -544,17 +509,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{parent_org}",
-                            value: 'parent',
-                            omit: false
+          match: "organization=#{parent_org}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: true
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: true
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{child_org}",
-                            value: 'child',
-                            omit: false
+          match: "organization=#{child_org}",
+          value: 'child',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -563,9 +528,6 @@ module ForemanPuppet
     end
 
     test '#enc should return correct override to host when multiple overrides for inherited locations exist' do
-      FactoryBot.create(:setting,
-        name: 'matchers_inheritance',
-        value: true)
       key = FactoryBot.create(:puppetclass_lookup_key, omit: true,
                                                        merge_overrides: false,
                                                        path: "location\norganization\nhostgroup",
@@ -582,17 +544,17 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{parent_loc}",
-                            value: 'parent',
-                            omit: false
+          match: "location=#{parent_loc}",
+          value: 'parent',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'org',
-                            omit: true
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'org',
+          omit: true
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{child_loc}",
-                            value: 'child',
-                            omit: false
+          match: "location=#{child_loc}",
+          value: 'child',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -608,13 +570,13 @@ module ForemanPuppet
 
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'test_incorrect',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'test_incorrect',
+          omit: false
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
-                            value: 'test_correct',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
+          value: 'test_correct',
+          omit: false
       end
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
       key.reload
@@ -630,15 +592,15 @@ module ForemanPuppet
 
       value = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
-                            value: 'test_correct',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)},location=#{taxonomies(:location1)}",
+          value: 'test_correct',
+          omit: false
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: 'test_incorrect',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: 'test_incorrect',
+          omit: false
       end
       enc = HostInfoProviders::PuppetInfo.new(@host).puppetclass_parameters
 
@@ -662,22 +624,22 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{parent_hostgroup},organization=#{taxonomies(:organization1)}",
-                            value: 'parent',
-                            omit: false
+          match: "hostgroup=#{parent_hostgroup},organization=#{taxonomies(:organization1)}",
+          value: 'parent',
+          omit: false
       end
       value2 = as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "hostgroup=#{child_hostgroup},organization=#{taxonomies(:organization1)}",
-                            value: 'child',
-                            omit: false
+          match: "hostgroup=#{child_hostgroup},organization=#{taxonomies(:organization1)}",
+          value: 'child',
+          omit: false
       end
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: 'loc',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: 'loc',
+          omit: false
       end
 
       enc = HostInfoProviders::PuppetInfo.new(host).puppetclass_parameters
@@ -694,21 +656,21 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: '<%= [2,3] %>',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: '<%= [2,3] %>',
+          omit: false
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "organization=#{taxonomies(:organization1)}",
-                            value: '<%= [3,4] %>',
-                            omit: false
+          match: "organization=#{taxonomies(:organization1)}",
+          value: '<%= [3,4] %>',
+          omit: false
       end
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "os=#{operatingsystems(:redhat)}",
-                            value: '<%= [4,5] %>',
-                            omit: false
+          match: "os=#{operatingsystems(:redhat)}",
+          value: '<%= [4,5] %>',
+          omit: false
       end
 
       key.reload
@@ -764,9 +726,9 @@ module ForemanPuppet
 
       as_admin do
         LookupValue.create! lookup_key_id: key.id,
-                            match: "location=#{taxonomies(:location1)}",
-                            value: '<%= "c" %>',
-                            omit: false
+          match: "location=#{taxonomies(:location1)}",
+          value: '<%= "c" %>',
+          omit: false
       end
 
       key.reload