foreman_salt 10.1.0 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d07824ea3e38fef2e9e0e6d29013dddc9e09d201144c0f2513e6afe482f8bb
-  data.tar.gz: a6bb3c8d79328b30ed8c0191274e71034c3f78140bd278d89679872e60373407
+  metadata.gz: 45be269828ccb4c9b6990f04eb7d4bceb4080448199dd88c6058c2678892fa68
+  data.tar.gz: 6abed1b754f72ad653f460414b4c7dcbb4f4612e325f01709155597d3ea72e92
 SHA512:
-  metadata.gz: 4f134063a3d744cdc69944c72de6cfb480758cd335b17448a207a818219f3426370500493fed8c449649631c7d54416d915c012730f021b0db5e271edfea81fc
-  data.tar.gz: a576753c9fe866c74c360214f3b8ef235144c596cde0df4bc6702d5cae2da2b3f8fd3307e524527a107c470a8ad2549a13efe92a2f0ce160615dc693c89544d0
+  metadata.gz: 02e65952f994dd58c780d1221bbaae4e63820ab2d2bdf6c27418cd6447dcc449310de2fd25fd28c831d157a1a22cf5c0c68afe74d2952a69b484870bde86a0d2
+  data.tar.gz: 85bf905813499b17af6ab9af5e398d57e7e1039eede9b374c2e6a9e52a52684258c07c774f117347378ad4293c05180cbb16069f96bb0d33b7a917bcecd5f212

data/README.md

@@ -13,6 +13,7 @@ This plug-in adds support for Salt to Foreman.
 | --------------- | --------------:|
 | <= 1.16         | 10.0.0         |
 | >= 1.17         | 10.1.0         |
+| >= 1.21         | 10.2.0         |
 
 ## Documentation
 

data/app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb

@@ -18,6 +18,7 @@ module ForemanSalt
 
         def load_vars_for_ajax
           return unless @host
+
           @obj                    = @host
           @salt_environment       = @host.salt_environment if @host
           @selected               = @host.salt_modules

data/app/controllers/foreman_salt/minions_controller.rb

@@ -26,7 +26,7 @@ module ForemanSalt
 
     def run
       if @minion.saltrun!
-        notice _('Successfully executed, check log files for more details')
+        success _('Successfully executed, check log files for more details')
       else
         error @minion.errors[:base].to_sentence
       end

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -27,7 +27,7 @@ module ForemanSalt
 
     def update
       if @salt_environment.update_attributes(salt_environment_params)
-        notice _('Successfully updated %s.' % @salt_environment.to_s)
+        success _('Successfully updated %s.' % @salt_environment.to_s)
         redirect_to salt_environments_path
       else
         process_error

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -31,7 +31,7 @@ module ForemanSalt
 
     def update
       if @salt_module.update_attributes(salt_module_params)
-        notice _('Successfully updated %s.' % @salt_module.to_s)
+        success _('Successfully updated %s.' % @salt_module.to_s)
         redirect_to salt_modules_path
       else
         process_error
@@ -63,14 +63,14 @@ module ForemanSalt
       @deletes = result[:deletes]
 
       if @changes.empty?
-        notice _('No changes found')
+        info _('No changes found')
         redirect_to salt_modules_path
       end
     end
 
     def apply_changes
       if params[:changed].blank?
-        notice _('No changes found')
+        info _('No changes found')
       else
         params[:changed].each do |environment, states|
           next unless states[:add] || states[:remove]
@@ -80,7 +80,7 @@ module ForemanSalt
         end
 
         clean_orphans
-        notice _('Successfully imported')
+        success _('Successfully imported')
       end
       redirect_to salt_modules_path
     end

data/app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb

@@ -3,7 +3,7 @@ module ForemanSalt
     extend ActiveSupport::Concern
 
     module Overrides
-      def proxy_actions(proxy, authorizer)
+      def feature_actions(proxy, authorizer)
         actions = super
 
         if proxy.has_feature?('Salt')

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -4,7 +4,7 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       module Overrides
-        def configuration
+        def configuration?
           super || !!salt_proxy
         end
 
@@ -49,6 +49,7 @@ module ForemanSalt
 
       def salt_modules_for_enc
         return [] unless salt_environment
+
         modules = salt_modules + (hostgroup ? hostgroup.all_salt_modules : [])
         ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => modules).pluck("salt_modules.name").uniq
       end

data/app/models/foreman_salt/concerns/hostgroup_extensions.rb

@@ -28,31 +28,29 @@ module ForemanSalt
       end
 
       def salt_proxy
-        return super unless ancestry.present?
-        SmartProxy.find_by_id(inherited_salt_proxy_id)
-      end
-
-      def inherited_salt_proxy_id
         if ancestry.present?
-          self[:salt_proxy_id] || self.class.sort_by_ancestry(ancestors.where('salt_proxy_id is not NULL')).last.try(:salt_proxy_id)
+          SmartProxy.with_features('Salt').find_by_id(inherited_salt_proxy_id)
         else
-          salt_proxy_id
+          super
         end
       end
 
-      def salt_environment
-        return super unless ancestry.present?
-        ForemanSalt::SaltEnvironment.find_by_id(inherited_salt_environment_id)
+      def inherited_salt_proxy_id
+        self[:salt_proxy_id] || nested(:salt_proxy_id)
       end
 
-      def inherited_salt_environment_id
+      def salt_environment
         if ancestry.present?
-          self[:salt_environment_id] || self.class.sort_by_ancestry(ancestors.where('salt_environment_id is not NULL')).last.try(:salt_environment_id)
+          ForemanSalt::SaltEnvironment.find_by_id(inherited_salt_environment_id)
         else
-          salt_environment_id
+          super
         end
       end
 
+      def inherited_salt_environment_id
+        self[:salt_environment_id] || nested(:salt_environment_id)
+      end
+
       def salt_master
         salt_proxy.to_s
       end

data/app/overrides/salt_environment_host_selector.rb

@@ -1,9 +1,14 @@
 selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironment.all, :id, :name,
                                  { :include_blank => blank_or_inherit_f(f, :salt_environment) },
-                                 { :label => _('Salt Environment'), :onchange => 'update_salt_states(this)', :'data-url' => salt_environment_selected_minions_path,
-                                   :'data-host-id' => (@host || @hostgroup).id, :help_inline => :indicator} %>"
+                                 { :label => _('Salt Environment'),
+                                   :onchange => 'update_salt_states(this)',
+                                   :'data-url' => salt_environment_selected_minions_path,
+                                   :'data-host-id' => (@host || @hostgroup).id,
+                                   :help_inline => :indicator} %>"
 
-Deface::Override.new(:virtual_path  => 'hosts/_form',
-                     :name          => 'add_salt_environment_to_host',
-                     :insert_bottom => 'div#primary',
-                     :text          => selector_text)
+Deface::Override.new(
+  :virtual_path => 'hosts/_form',
+  :name => 'add_salt_environment_to_host',
+  :insert_bottom => 'div#primary',
+  :text => selector_text
+)

data/app/overrides/salt_environment_hostgroup_selector.rb

@@ -1,9 +1,12 @@
 selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironment.all, :id, :name,
                                  { :include_blank => blank_or_inherit_f(f, :salt_environment) },
-                                 { :label => _('Salt Environment'), :onchange => 'update_salt_states(this)', :'data-url' => salt_environment_selected_hostgroups_path,
+                                 { :label => _('Salt Environment'), :onchange => 'update_salt_states(this)',
+                                   :'data-url' => salt_environment_selected_hostgroups_path,
                                    :'data-host-id' => (@host || @hostgroup).id, :help_inline => :indicator} %>"
 
-Deface::Override.new(:virtual_path  => 'hostgroups/_form',
-                     :name          => 'add_salt_environment_to_hostgroup',
-                     :insert_bottom => 'div#primary',
-                     :text          => selector_text)
+Deface::Override.new(
+  :virtual_path => 'hostgroups/_form',
+  :name => 'add_salt_environment_to_hostgroup',
+  :insert_bottom => 'div#primary',
+  :text => selector_text
+)

data/app/overrides/salt_proxy_selector.rb

@@ -2,12 +2,16 @@ selector_text = "<%= select_f f, :salt_proxy_id, SmartProxy.unscoped.with_featur
                                  { :include_blank => blank_or_inherit_f(f, :salt_proxy) },
                                  { :label         => _('Salt Master') } %>"
 
-Deface::Override.new(:virtual_path  => 'hosts/_form',
-                     :name          => 'add_salt_proxy_to_host',
-                     :insert_bottom => 'div#primary',
-                     :text          => selector_text)
+Deface::Override.new(
+  :virtual_path => 'hosts/_form',
+  :name => 'add_salt_proxy_to_host',
+  :insert_bottom => 'div#primary',
+  :text => selector_text
+)
 
-Deface::Override.new(:virtual_path  => 'hostgroups/_form',
-                     :name          => 'add_salt_proxy_to_hostgroup',
-                     :insert_bottom => 'div#primary',
-                     :text          => selector_text)
+Deface::Override.new(
+  :virtual_path => 'hostgroups/_form',
+  :name => 'add_salt_proxy_to_hostgroup',
+  :insert_bottom => 'div#primary',
+  :text => selector_text
+)

data/app/services/foreman_salt/fact_parser.rb

@@ -56,17 +56,18 @@ module ForemanSalt
 
       facts.each do |fact, value|
         next unless value && fact.to_s =~ /^ip_interfaces/
-        (_, interface_name, _) = fact.split(FactName::SEPARATOR)
+
+        (_, interface_name) = fact.split(FactName::SEPARATOR)
 
         next if (IPAddr.new('fe80::/10').include?(value) rescue false)
-        
+
         if !interface_name.blank? && interface_name != 'lo'
           interface = interfaces.fetch(interface_name, {})
           interface[:macaddress] = macs[interface_name]
-          if Net::Validations::validate_ip6(value)
-            interface[:ipaddress6] = value
+          if Net::Validations.validate_ip6(value)
+            interface[:ipaddress6] = value unless interface.include?(:ipaddress6)
           else
-            interface[:ipaddress] = value
+            interface[:ipaddress] = value unless interface.include?(:ipaddress)
           end
           interfaces[interface_name] = interface
         end
@@ -101,6 +102,7 @@ module ForemanSalt
         @macs = {}
         facts.each do |fact, value|
           next unless value && fact.to_s =~ /^hwaddr_interfaces/
+
           data = fact.split(FactName::SEPARATOR)
           interface = data[1]
           macs[interface] = value

data/app/services/foreman_salt/report_importer.rb

@@ -5,6 +5,7 @@ module ForemanSalt
 
     def self.import(raw, proxy_id = nil)
       fail ::Foreman::Exception.new(_('Invalid report')) unless raw.is_a?(Hash)
+
       raw.map do |host, report|
         importer = ForemanSalt::ReportImporter.new(host, report, proxy_id)
         importer.import
@@ -141,6 +142,7 @@ module ForemanSalt
 
       @report = ConfigReport.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
       return @report unless @report.save
+
       import_log_messages
     end
 

data/config/routes.rb

@@ -19,13 +19,11 @@ Rails.application.routes.draw do
       end
     end
 
-    constraints :id => /[\w\.-]+/ do
-      resources :salt_modules, :controller => 'foreman_salt/salt_modules' do
-        collection do
-          get 'import'
-          get 'auto_complete_search'
-          post 'apply_changes'
-        end
+    resources :salt_modules, :controller => 'foreman_salt/salt_modules' do
+      collection do
+        get 'import'
+        get 'auto_complete_search'
+        post 'apply_changes'
       end
     end
 

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '10.1.0'
+  VERSION = '10.2.0'
 end

data/test/factories/foreman_salt_factories.rb

@@ -9,17 +9,7 @@ FactoryBot.define do
 end
 
 FactoryBot.modify do
-  factory :host do
-    trait :with_salt_proxy do
-      salt_proxy { FactoryBot.build :smart_proxy, :with_salt_feature }
-    end
-  end
-
   factory :hostgroup do
-    trait :with_salt_proxy do
-      salt_proxy { FactoryBot.build :smart_proxy, :with_salt_feature }
-    end
-
     trait :with_salt_modules do
       salt_environment { FactoryBot.build :salt_environment }
       salt_modules { FactoryBot.create_list :salt_module, 10, :salt_environments => [self.salt_environment] }
@@ -28,7 +18,7 @@ FactoryBot.modify do
 
   factory :smart_proxy do
     trait :with_salt_feature do
-      features { [::Feature.where(:name => 'Salt').first_or_create] }
+      features { [::Feature.find_or_create_by(:name => 'Salt')] }
     end
   end
 end

data/test/functional/api/v2/salt_keys_controller_test.rb

@@ -15,7 +15,7 @@ class ::ForemanSalt::Api::V2::SaltKeysControllerTest < ActionController::TestCas
 
   test 'should update keys' do
     ProxyAPI::Salt.any_instance.expects(:key_accept).once.returns(true)
-    put :update, params: { :smart_proxy_id => @proxy.id, :name => 'saltstack.example.com', :key => { :state => 'accepted' } }
+    put :update, params: { :smart_proxy_id => @proxy.id, :name => 'saltstack.example.com', :state => 'accepted' }
     assert_response :success
   end
 

data/test/functional/api/v2/salt_states_controller_test.rb

@@ -52,7 +52,7 @@ class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestC
     test 'should import only from a given environment' do
       post :import, params: { :smart_proxy_id => @proxy.id, :salt_environments => ['env2'] }
       assert_response :success
-      refute ::ForemanSalt::SaltEnvironment.where(:name => 'env1').first
+      assert_not ::ForemanSalt::SaltEnvironment.where(:name => 'env1').first
       assert ::ForemanSalt::SaltEnvironment.where(:name => 'env2').first
     end
 
@@ -70,15 +70,15 @@ class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestC
       state = FactoryBot.create :salt_module
       post :import, params: { :smart_proxy_id => @proxy.id, :actions => ['remove'] }
       assert_response :success
-      refute ::ForemanSalt::SaltModule.where(:id => state).first
-      refute ::ForemanSalt::SaltModule.where(:name => 'state1').first
+      assert_not ::ForemanSalt::SaltModule.where(:id => state).first
+      assert_not ::ForemanSalt::SaltModule.where(:name => 'state1').first
     end
 
     test 'dryrun should do nothing' do
       post :import, params: { :smart_proxy_id => @proxy.id, :dryrun => true }
       assert_response :success
-      refute ::ForemanSalt::SaltModule.all.any?
-      refute ::ForemanSalt::SaltEnvironment.all.any?
+      assert_not ::ForemanSalt::SaltModule.all.any?
+      assert_not ::ForemanSalt::SaltEnvironment.all.any?
     end
   end
 end

data/test/functional/minions_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 module ForemanSalt
   class MinionsControllerTest < ActionController::TestCase
     test 'salt smart proxy should get salt external node' do
-      User.current = nil
+      User.current = User.anonymous_admin
       Setting[:restrict_registered_smart_proxies] = true
       Setting[:require_ssl_smart_proxies] = false
 

data/test/integration/salt_autosign_test.rb

@@ -15,6 +15,13 @@ module ForemanSalt
       assert_row_button(smart_proxies_path, @proxy.name, 'Salt Autosign', true)
     end
 
+    test 'smart proxy details has autosign link' do
+      visit smart_proxy_path(@proxy)
+      assert page.has_link? "Salt Autosign"
+      click_link "Salt Autosign"
+      assert page.has_content?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
+    end
+
     test 'index page' do
       visit smart_proxy_salt_autosign_index_path(:smart_proxy_id => @proxy.id)
       assert find_link('Keys').visible?, 'Keys is not visible'

data/test/integration/salt_environment_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'integration_test_helper'
 
 module ForemanSalt
-  class SaltEnvironmentTest < ActionDispatch::IntegrationTest
+  class SaltEnvironmentTest < IntegrationTestWithJavascript
     test 'index page' do
       FactoryBot.create_list :salt_environment, 5
       assert_index_page(salt_environments_path, 'Salt Environment', 'New Salt Environment')

data/test/integration/salt_keys_test.rb

@@ -7,10 +7,10 @@ module ForemanSalt
       @proxy = FactoryBot.create :smart_proxy, :with_salt_feature
 
       ::ProxyAPI::Salt.any_instance.stubs(:key_list).returns(
-        'saltstack.example.com'    => { 'state' => 'accepted',   'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0' },
+        'saltstack.example.com' => { 'state' => 'accepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0' },
         'saltclient01.example.com' => { 'state' => 'unaccepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1' },
         'saltclient02.example.com' => { 'state' => 'unaccepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2' },
-        'saltclient03.example.com' => { 'state' => 'rejected',   'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3' }
+        'saltclient03.example.com' => { 'state' => 'rejected', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3' }
       )
     end
 
@@ -18,6 +18,13 @@ module ForemanSalt
       assert_row_button(smart_proxies_path, @proxy.name, 'Salt Keys', true)
     end
 
+    test 'smart proxy details has keys link' do
+      visit smart_proxy_path(@proxy)
+      assert page.has_link? "Salt Keys"
+      click_link "Salt Keys"
+      assert page.has_content?("Salt Keys on #{@proxy.hostname}"), 'Page title does not appear'
+    end
+
     test 'index page' do
       visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
       assert find_link('Autosign').visible?, 'Autosign is not visible'

data/test/integration/salt_module_test.rb

@@ -2,18 +2,14 @@ require 'test_plugin_helper'
 require 'integration_test_helper'
 
 module ForemanSalt
-  class SaltModuleTest < ActionDispatch::IntegrationTest
+  class SaltModuleTest < IntegrationTestWithJavascript
     setup do
-      User.current = User.anonymous_admin
+      User.current = users :admin
 
       states = %w(state1 state2 state3 state4)
       state_list = { 'env1' => states, 'env2' => states }
 
       ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
-
-      # FIXME #12143
-      FactoryBot.create(:permission, :name => 'view_salt_environments',
-                         :resource_type => 'ForemanSalt::SaltEnvironment')
     end
 
     test 'index page' do

data/test/unit/grains_centos.json

@@ -51,6 +51,7 @@
     "defaultencoding": "UTF8",
     "path": "/sbin:/usr/sbin:/bin:/usr/bin",
     "ip_interfaces::eth0::0": "10.7.13.141",
+    "ip_interfaces::eth0::1": "10.7.23.141",
     "manufacturer": "Red Hat",
     "fqdn": "saltclient01.example.com",
     "os": "CentOS",
@@ -95,8 +96,9 @@
     "osrelease": "6.5",
     "num_cpus": 1,
     "virtual": "kvm",
-    "ipv4::0": "10.7.13.141",
-    "ipv4::1": "127.0.0.1",
+    "ipv4::0": "10.7.23.141",
+    "ipv4::1": "10.7.13.141",
+    "ipv4::2": "127.0.0.1",
     "_type": "foreman_salt",
     "nodename": "saltclient01.example.com",
     "os_family": "RedHat",

data/test/unit/grains_importer_test.rb

@@ -6,7 +6,8 @@ module ForemanSalt
     allow_transactions_for_any_importer
 
     setup do
-      User.current = User.find_by_login 'admin'
+      disable_orchestration
+      User.current = users :admin
       Setting[:create_new_host_when_facts_are_uploaded] = true
 
       Operatingsystem.where(:name => 'CentOS', :major => '6', :minor => '5').delete_all

data/test/unit/host_extensions_test.rb

@@ -3,27 +3,32 @@ require 'test_plugin_helper'
 module ForemanSalt
   class HostExtensionsTest < ActiveSupport::TestCase
     setup do
-      User.current = User.find_by_login 'admin'
+      User.current = users :admin
+      @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
     end
 
     test 'host has a salt smart proxy' do
-      host = FactoryBot.create :host, :with_salt_proxy
+      host = FactoryBot.create :host
+      host.salt_proxy = @proxy
       assert host.salt_proxy.has_feature? 'Salt'
     end
 
     test 'smart_proxy_ids returns salt smart proxy' do
-      host = FactoryBot.create :host, :with_salt_proxy
+      host = FactoryBot.create :host
+      host.salt_proxy = @proxy
       assert host.smart_proxy_ids.include? host.salt_proxy_id
     end
 
     test 'host params includes salt_master' do
-      host = FactoryBot.create :host, :with_salt_proxy
+      host = FactoryBot.create :host
+      host.salt_proxy = @proxy
       assert host.params.key? 'salt_master'
       assert_equal host.params['salt_master'], host.salt_master
     end
 
     test 'host inherits salt proxy from host group' do
-      hostgroup = FactoryBot.create :hostgroup, :with_salt_proxy
+      hostgroup = FactoryBot.create :hostgroup
+      hostgroup.salt_proxy = @proxy
       host = FactoryBot.create :host, :hostgroup => hostgroup
       host.set_hostgroup_defaults
       assert_equal host.salt_proxy, hostgroup.salt_proxy
@@ -36,25 +41,25 @@ module ForemanSalt
       state = FactoryBot.create :salt_module
       other_environment.salt_modules << state
 
-      host = FactoryBot.create :host, :with_salt_proxy, :salt_environment => hosts_environment
+      host = FactoryBot.create :host, :salt_environment => hosts_environment
+      host.salt_proxy = @proxy
       host.salt_modules = [state]
 
-      refute host.save
+      assert_not host.save
       assert host.errors.full_messages.include? 'Salt states must be in the environment of the host'
     end
 
     test '#configuration? considers salt' do
       host = FactoryBot.build(:host)
-      proxy = FactoryBot.build(:smart_proxy)
-
-      refute host.configuration?
-      host.salt_proxy = proxy
+      assert_not host.configuration?
+      host.salt_proxy = @proxy
       assert host.configuration?
     end
 
     context 'key handling' do
       before do
-        @host = FactoryBot.create(:host, :with_salt_proxy, :managed, :build => true)
+        @host = FactoryBot.create(:host, :managed, :build => true)
+        @host.salt_proxy = @proxy
         @key_stub = stub("key")
         ForemanSalt::SmartProxies::SaltKeys.expects(:find).at_least_once.with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
       end
@@ -66,7 +71,7 @@ module ForemanSalt
       end
 
       test 'host key is deleted when host is removed' do
-        @key_stub.expects(:delete).returns(true)
+        @key_stub.expects(:delete).at_least_once.returns(true)
         assert @host.destroy
       end
     end

data/test/unit/hostgroup_extensions_test.rb

@@ -3,11 +3,13 @@ require 'test_plugin_helper'
 module ForemanSalt
   class HostgroupExtensionsTest < ActiveSupport::TestCase
     setup do
-      User.current = User.find_by_login 'admin'
+      User.current = users :admin
+      @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
     end
 
     test 'host group has a salt smart proxy' do
-      hostgroup = FactoryBot.create :hostgroup, :with_salt_proxy
+      hostgroup = FactoryBot.create :hostgroup
+      hostgroup.salt_proxy = @proxy
       assert hostgroup.salt_proxy.features.map(&:name).include? 'Salt'
     end
 
@@ -19,11 +21,23 @@ module ForemanSalt
 
     test 'child host group inherits salt proxy from child parent' do
       parent = FactoryBot.create :hostgroup
-      child_one = FactoryBot.create :hostgroup, :with_salt_proxy, :parent => parent
+      child_one = FactoryBot.create :hostgroup, :parent => parent
+      child_one.salt_proxy = @proxy
+      child_one.reload
       child_two = FactoryBot.create :hostgroup, :parent => child_one
       assert_equal child_two.salt_proxy, child_one.salt_proxy
     end
 
+    test 'child host group inherits salt environment from child parent' do
+      environment = FactoryBot.create :salt_environment
+      parent = FactoryBot.create :hostgroup
+      child_one = FactoryBot.create :hostgroup, :parent => parent
+      child_one.salt_environment = environment
+      child_one.reload
+      child_two = FactoryBot.create :hostgroup, :parent => child_one
+      assert_equal child_two.salt_environment, child_one.salt_environment
+    end
+
     test 'child and parent salt modules are combined' do
       environment = FactoryBot.create :salt_environment
       parent = FactoryBot.create :hostgroup, :with_salt_modules, :salt_environment => environment

data/test/unit/report_importer_test.rb

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 module ForemanSalt
   class ReportImporterTest < ActiveSupport::TestCase
     setup do
-      User.current = User.find_by_login 'admin'
+      User.current = users :admin
       Setting[:create_new_host_when_facts_are_uploaded] = true
 
       @report = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'highstate.json')))
@@ -12,7 +12,7 @@ module ForemanSalt
     end
 
     test 'importing report creates a host' do
-      refute Host.find_by_name(@host)
+      assert_not Host.find_by_name(@host)
       ForemanSalt::ReportImporter.import(@report)
       assert Host.find_by_name(@host)
     end

data/test/unit/salt_fact_parser_test.rb

@@ -0,0 +1,46 @@
+require 'test_plugin_helper'
+
+module ForemanSalt
+  class SaltFactsParserTest < ActiveSupport::TestCase
+    attr_reader :importer
+
+    def setup
+      grains = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'grains_centos.json')))
+      @importer = FactParser.new grains["facts"]
+      User.current = users :admin
+    end
+
+    test "should return list of interfaces" do
+      assert importer.interfaces.present?
+      assert_not_nil importer.suggested_primary_interface(FactoryBot.build(:host))
+      assert importer.interfaces.key?(importer.suggested_primary_interface(FactoryBot.build(:host)).first)
+    end
+
+    test "should set operatingsystem correctly" do
+      os = importer.operatingsystem
+      assert os.present?
+      assert_equal 'CentOS', os.name
+      assert_equal '6', os.major
+      assert_equal '5', os.minor
+      assert_equal 'CentOS 6.5', os.title
+    end
+
+    test "should set domain correctly" do
+      domain = importer.domain
+      assert domain.present?
+      assert_equal 'example.com', domain.name
+    end
+
+    test "should set ip correctly" do
+      assert_equal '10.7.13.141', importer.ip
+    end
+
+    test "should set primary_interface correctly" do
+      assert_equal 'eth0', importer.primary_interface
+    end
+
+    test "should set mac correctly" do
+      assert_equal '52:54:00:35:30:2a', importer.mac
+    end
+  end
+end

data/test/unit/salt_keys_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class SaltKeysTest < ActiveSupport::TestCase
   setup do
-    User.current = User.find_by_login 'admin'
+    User.current = users :admin
 
     # Fix for 1.8.7 OpenStruct http://stackoverflow.com/questions/9079441/populate-select-tag-ruby-rails
     OpenStruct.__send__(:define_method, :id) { @table[:id] }
@@ -10,10 +10,10 @@ class SaltKeysTest < ActiveSupport::TestCase
     @proxy = OpenStruct.new(:id => 1, :url => 'http://dummy.example.com:9090')
 
     ProxyAPI::Salt.any_instance.stubs(:key_list).returns(
-      'saltstack.example.com'    => { 'state' => 'accepted',   'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0' },
+      'saltstack.example.com' => { 'state' => 'accepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0' },
       'saltclient01.example.com' => { 'state' => 'unaccepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1' },
       'saltclient02.example.com' => { 'state' => 'unaccepted', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2' },
-      'saltclient03.example.com' => { 'state' => 'rejected',   'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3' }
+      'saltclient03.example.com' => { 'state' => 'rejected', 'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3' }
     )
   end
 

data/test/unit/salt_modules_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class SaltModulesTest < ActiveSupport::TestCase
   setup do
-    User.current = User.find_by_login 'admin'
+    User.current = users :admin
   end
 
   test 'salt module has a valid name' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 10.1.0
+  version: 10.2.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -161,6 +161,7 @@ files:
 - test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
+- test/unit/salt_fact_parser_test.rb
 - test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
 homepage: https://github.com/theforeman/foreman_salt
@@ -183,27 +184,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
 - test/integration/salt_environment_test.rb
+- test/integration/salt_module_test.rb
 - test/integration/salt_autosign_test.rb
 - test/integration/salt_keys_test.rb
-- test/integration/salt_module_test.rb
-- test/functional/minions_controller_test.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
-- test/functional/api/v2/salt_environments_controller_test.rb
-- test/functional/api/v2/salt_keys_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
-- test/test_plugin_helper.rb
 - test/factories/foreman_salt_factories.rb
-- test/unit/host_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/unit/grains_centos.json
+- test/unit/grains_importer_test.rb
+- test/unit/hostgroup_extensions_test.rb
 - test/unit/highstate.json
+- test/unit/salt_fact_parser_test.rb
 - test/unit/salt_modules_test.rb
-- test/unit/hostgroup_extensions_test.rb
+- test/unit/grains_centos.json
+- test/unit/report_importer_test.rb
 - test/unit/salt_keys_test.rb
-- test/unit/grains_importer_test.rb
+- test/unit/host_extensions_test.rb
+- test/test_plugin_helper.rb
+- test/functional/minions_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb