foreman_salt 9.0.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505150b65e85f4508c1128ef4d00643acb1ee271aa27f4e1087aff29fe861a29
-  data.tar.gz: 7cb8eba18f16129c2dcfc1b223ca3ca46c4c5d0043dc06b4a1467107cfe834c4
+  metadata.gz: c6a5c38ada1b7092ea56ff7da05ebdfd13bff174ddd00b04d61813ea3f18b367
+  data.tar.gz: c559363f1e3a18b955b3707dc410cb094e6b4e4556ca99c4ae059c7cad09adb1
 SHA512:
-  metadata.gz: 2f0b9777d3f10bdeb52a50cf8cb62328cf350f78088e224f77a51c5ebd1d43ca4ddaf8029f2b8de33ba6c4ceda2986f40009cf2147710277327afec2d1b2a94c
-  data.tar.gz: 72fee87317574fec91bab0ecff7f61280659318a5a38b79bff7c54b64c3c65f6d995b7089a6303c9f7449575da86790606c01c9249aa0373fc82de313a852d01
+  metadata.gz: 240c3e9a0d46d6cf4ddebe976129af37917a108d55be3aeb434262a9cddd824b06e0266f41cc528703acef7e0f6c4ea7db013fa9c5262de6004ed1820c0927f3
+  data.tar.gz: 9eeb42cebc16d142a157c12e11da6121974516cd022e0efcdef841dc94d30b740f532ab730e491c0bb7e7eb6fb1b3dc366ecffcad749732c574d0d1d896c82d9

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

@@ -3,8 +3,25 @@ module ForemanSalt
     module HostgroupsControllerExtensions
       extend ActiveSupport::Concern
 
+      module Overrides
+        def load_vars_for_ajax
+          super
+          @obj = @hostgroup
+          @salt_environment ||= @hostgroup.salt_environment
+
+          if @salt_environment
+            @inherited_salt_modules = @salt_environment.salt_modules.where(:id => @hostgroup.inherited_salt_modules)
+            @salt_modules           = @salt_environment.salt_modules - @inherited_salt_modules
+          else
+            @inherited_salt_modules = @salt_modules = []
+          end
+
+          @selected = @hostgroup.salt_modules || []
+        end
+      end
+
       included do
-        alias_method_chain :load_vars_for_ajax, :salt_modules
+        prepend Overrides
       end
 
       def salt_environment_selected
@@ -18,23 +35,6 @@ module ForemanSalt
           logger.info 'environment_id is required to render states'
         end
       end
-
-      private
-
-      def load_vars_for_ajax_with_salt_modules
-        load_vars_for_ajax_without_salt_modules
-        @obj = @hostgroup
-        @salt_environment ||= @hostgroup.salt_environment
-
-        if @salt_environment
-          @inherited_salt_modules = @salt_environment.salt_modules.where(:id => @hostgroup.inherited_salt_modules)
-          @salt_modules           = @salt_environment.salt_modules - @inherited_salt_modules
-        else
-          @inherited_salt_modules = @salt_modules = []
-        end
-
-        @selected = @hostgroup.salt_modules || []
-      end
     end
   end
 end

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

@@ -3,31 +3,32 @@ module ForemanSalt
     module HostsControllerExtensions
       extend ActiveSupport::Concern
 
-      included do
-        alias_method_chain :load_vars_for_ajax, :salt_modules
-        alias_method_chain :process_hostgroup, :salt_modules
-      end
+      module Overrides
+        def process_hostgroup
+          @hostgroup = Hostgroup.find(params[:host][:hostgroup_id]) if params[:host][:hostgroup_id].to_i > 0
+          return head(:not_found) unless @hostgroup
 
-      def process_hostgroup_with_salt_modules
-        @hostgroup = Hostgroup.find(params[:host][:hostgroup_id]) if params[:host][:hostgroup_id].to_i > 0
-        return head(:not_found) unless @hostgroup
+          @salt_modules           = @host.salt_modules if @host
+          @salt_environment       = @host.salt_environment if @host
+          @inherited_salt_modules = @hostgroup.all_salt_modules
+          super
+        end
 
-        @salt_modules           = @host.salt_modules if @host
-        @salt_environment       = @host.salt_environment if @host
-        @inherited_salt_modules = @hostgroup.all_salt_modules
-        process_hostgroup_without_salt_modules
-      end
+        private
 
-      private
+        def load_vars_for_ajax
+          return unless @host
+          @obj                    = @host
+          @salt_environment       = @host.salt_environment if @host
+          @selected               = @host.salt_modules
+          @salt_modules           = @host.salt_environment ? @salt_environment.salt_modules : []
+          @inherited_salt_modules = @host.hostgroup.all_salt_modules if @host.hostgroup
+          super
+        end
+      end
 
-      def load_vars_for_ajax_with_salt_modules
-        return unless @host
-        @obj                    = @host
-        @salt_environment       = @host.salt_environment if @host
-        @selected               = @host.salt_modules
-        @salt_modules           = @host.salt_environment ? @salt_environment.salt_modules : []
-        @inherited_salt_modules = @host.hostgroup.all_salt_modules if @host.hostgroup
-        load_vars_for_ajax_without_salt_modules
+      included do
+        prepend Overrides
       end
     end
   end

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

@@ -2,37 +2,37 @@ module ForemanSalt
   module HostsHelperExtensions
     extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :host_title_actions, :salt
-      alias_method_chain :show_appropriate_host_buttons, :salt
-      alias_method_chain :overview_fields, :salt
-    end
-
-    def show_appropriate_host_buttons_with_salt(host)
-      (show_appropriate_host_buttons_without_salt(host) +
+    module Overrides
+      def show_appropriate_host_buttons(host)
+        (super(host) +
          [(link_to_if_authorized(_('Salt ENC'), { :controller => :'foreman_salt/minions', :action => :node, :id => host },
                                  :title => _('Salt external nodes YAML dump'), :class => 'btn btn-default') unless host.salt_master.blank?)]).flatten.compact
-    end
+      end
 
-    def host_title_actions_with_salt(host)
-      title_actions(
-        button_group(
-          if host.try(:salt_proxy)
-            link_to_if_authorized(_('Run Salt'), { :controller => :'foreman_salt/minions', :action => :run, :id => host },
-                                  :title => _('Trigger a state.highstate run on a node'), :class => 'btn btn-primary')
+      def host_title_actions(host)
+        title_actions(
+          button_group(
+            if host.try(:salt_proxy)
+              link_to_if_authorized(_('Run Salt'), { :controller => :'foreman_salt/minions', :action => :run, :id => host },
+                                    :title => _('Trigger a state.highstate run on a node'), :class => 'btn btn-primary')
           end
+          )
         )
-      )
-      host_title_actions_without_salt(host)
-    end
+        super(host)
+      end
+
+      def overview_fields(host)
+        fields = super(host)
 
-    def overview_fields_with_salt(host)
-      fields = overview_fields_without_salt(host)
+        fields.insert(5, [_('Salt Master'), (link_to(host.salt_proxy, hosts_path(:search => "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
+        fields.insert(6, [_('Salt Environment'), (link_to(host.salt_environment, hosts_path(:search => "salt_environment = #{host.salt_environment}")) if host.salt_environment)])
 
-      fields.insert(5, [_('Salt Master'), (link_to(host.salt_proxy, hosts_path(:search => "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
-      fields.insert(6, [_('Salt Environment'), (link_to(host.salt_environment, hosts_path(:search => "salt_environment = #{host.salt_environment}")) if host.salt_environment)])
+        fields
+      end
+    end
 
-      fields
+    included do
+      prepend Overrides
     end
   end
 end

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

@@ -2,19 +2,21 @@ module ForemanSalt
   module SmartProxiesHelperExtensions
     extend ActiveSupport::Concern
 
-    included do
-      alias_method_chain :proxy_actions, :salt_proxy
-    end
+    module Overrides
+      def proxy_actions(proxy, authorizer)
+        actions = super
 
-    def proxy_actions_with_salt_proxy(proxy, authorizer)
-      actions = proxy_actions_without_salt_proxy(proxy, authorizer)
+        if proxy.has_feature?('Salt')
+          actions << display_link_if_authorized(_('Salt Keys'), :controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy)
+          actions << display_link_if_authorized(_('Salt Autosign'), :controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy)
+        end
 
-      if proxy.has_feature?('Salt')
-        actions << display_link_if_authorized(_('Salt Keys'), :controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy)
-        actions << display_link_if_authorized(_('Salt Autosign'), :controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy)
+        actions
       end
+    end
 
-      actions
+    included do
+      prepend Overrides
     end
   end
 end

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

@@ -3,6 +3,30 @@ module ForemanSalt
     module HostManagedExtensions
       extend ActiveSupport::Concern
 
+      module Overrides
+        def configuration
+          super || !!salt_proxy
+        end
+
+        def params
+          params = super
+          params['salt_master'] = salt_master unless salt_master.blank?
+          params
+        end
+
+        def smart_proxy_ids
+          ids = super
+          [salt_proxy, hostgroup.try(:salt_proxy)].compact.each do |proxy|
+            ids << proxy.id
+          end
+          ids
+        end
+
+        def inherited_attributes
+          super + %w(salt_proxy_id salt_environment_id)
+        end
+      end
+
       included do
         has_many :host_salt_modules, :foreign_key => :host_id, :class_name => '::ForemanSalt::HostSaltModule'
         has_many :salt_modules, :through => :host_salt_modules, :class_name => '::ForemanSalt::SaltModule'
@@ -10,10 +34,7 @@ module ForemanSalt
         belongs_to :salt_proxy, :class_name => 'SmartProxy'
         belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
 
-        alias_method_chain :params, :salt_proxy
-        alias_method_chain :smart_proxy_ids, :salt_proxy
-        alias_method_chain :inherited_attributes, :salt
-        alias_method_chain :configuration?, :salt
+        prepend Overrides
 
         scoped_search :relation => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
         scoped_search :relation => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
@@ -26,16 +47,6 @@ module ForemanSalt
         before_destroy   :delete_salt_key, :if => ->(host) { host.salt_proxy }
       end
 
-      def configuration_with_salt?
-        configuration_without_salt? || !!salt_proxy
-      end
-
-      def params_with_salt_proxy
-        params = params_without_salt_proxy
-        params['salt_master'] = salt_master unless salt_master.blank?
-        params
-      end
-
       def salt_modules_for_enc
         return [] unless salt_environment
         modules = salt_modules + (hostgroup ? hostgroup.all_salt_modules : [])
@@ -58,18 +69,6 @@ module ForemanSalt
         false
       end
 
-      def inherited_attributes_with_salt
-        inherited_attributes_without_salt + %w(salt_proxy_id salt_environment_id)
-      end
-
-      def smart_proxy_ids_with_salt_proxy
-        ids = smart_proxy_ids_without_salt_proxy
-        [salt_proxy, hostgroup.try(:salt_proxy)].compact.each do |proxy|
-          ids << proxy.id
-        end
-        ids
-      end
-
       def salt_modules_in_host_environment
         return unless self.salt_modules.any?
 

data/db/migrate/20140813081913_add_salt_proxy_to_host_and_host_group.rb

@@ -1,4 +1,4 @@
-class AddSaltProxyToHostAndHostGroup < ActiveRecord::Migration
+class AddSaltProxyToHostAndHostGroup < ActiveRecord::Migration[4.2]
   def self.up
     add_column :hosts, :salt_proxy_id, :integer
     add_column :hostgroups, :salt_proxy_id, :integer

data/db/migrate/20140817210214_create_salt_modules.rb

@@ -1,8 +1,8 @@
-class CreateSaltModules < ActiveRecord::Migration
+class CreateSaltModules < ActiveRecord::Migration[4.2]
   def self.up
     create_table :salt_modules do |t|
       t.string :name, :default => '', :null => false
-      t.timestamps
+      t.timestamps :null => true
     end
 
     create_table 'hosts_salt_modules', :id => false do |t|

data/db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb

@@ -1,4 +1,4 @@
-class AddSaltModulesToHostgroups < ActiveRecord::Migration
+class AddSaltModulesToHostgroups < ActiveRecord::Migration[4.2]
   def self.up
     create_table 'hostgroups_salt_modules', :id => false do |t|
       t.column :hostgroup_id, :integer

data/db/migrate/20140920232200_create_salt_environments.rb

@@ -1,8 +1,8 @@
-class CreateSaltEnvironments < ActiveRecord::Migration
+class CreateSaltEnvironments < ActiveRecord::Migration[4.2]
   def self.up
     create_table :salt_environments do |t|
       t.string :name, :default => '', :null => false
-      t.timestamps
+      t.timestamps :null => true
     end
 
     add_column :hosts, :salt_environment_id, :integer

data/db/migrate/20150220122707_fix_incorrect_report_metrics.rb

@@ -1,4 +1,4 @@
-class FixIncorrectReportMetrics < ActiveRecord::Migration
+class FixIncorrectReportMetrics < ActiveRecord::Migration[4.2]
   def up
     Report.all.each do |report|
       next unless report.metrics && report.metrics['time']

data/db/migrate/20150411003302_add_environments_to_modules.rb

@@ -1,4 +1,4 @@
-class AddEnvironmentsToModules < ActiveRecord::Migration
+class AddEnvironmentsToModules < ActiveRecord::Migration[4.2]
   def up
     create_table 'salt_module_environments' do |t|
       t.references :salt_module

data/db/migrate/20150509094409_rename_join_tables.rb

@@ -1,4 +1,4 @@
-class RenameJoinTables < ActiveRecord::Migration
+class RenameJoinTables < ActiveRecord::Migration[4.2]
   def up
     rename_table :hosts_salt_modules, :host_salt_modules
     rename_table :hostgroups_salt_modules, :hostgroup_salt_modules

data/db/migrate/20150509101505_add_primary_keys.rb

@@ -1,4 +1,4 @@
-class AddPrimaryKeys < ActiveRecord::Migration
+class AddPrimaryKeys < ActiveRecord::Migration[4.2]
   def change
     add_column :host_salt_modules, :id, :primary_key
     add_column :hostgroup_salt_modules, :id, :primary_key

data/db/migrate/20161103104146_add_index_to_join_tables.rb

@@ -1,4 +1,4 @@
-class AddIndexToJoinTables < ActiveRecord::Migration
+class AddIndexToJoinTables < ActiveRecord::Migration[4.2]
   def change
     add_index :host_salt_modules, :host_id
     add_index :host_salt_modules, :salt_module_id

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '9.0.1'
+  VERSION = '10.0.0'
 end

data/test/factories/foreman_salt_factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :salt_module, :class => 'ForemanSalt::SaltModule' do
     sequence(:name) { |n| "module#{n}" }
   end
@@ -8,21 +8,21 @@ FactoryGirl.define do
   end
 end
 
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :host do
     trait :with_salt_proxy do
-      salt_proxy { FactoryGirl.build :smart_proxy, :with_salt_feature }
+      salt_proxy { FactoryBot.build :smart_proxy, :with_salt_feature }
     end
   end
 
   factory :hostgroup do
     trait :with_salt_proxy do
-      salt_proxy { FactoryGirl.build :smart_proxy, :with_salt_feature }
+      salt_proxy { FactoryBot.build :smart_proxy, :with_salt_feature }
     end
 
     trait :with_salt_modules do
-      salt_environment { FactoryGirl.build :salt_environment }
-      salt_modules { FactoryGirl.create_list :salt_module, 10, :salt_environments => [self.salt_environment] }
+      salt_environment { FactoryBot.build :salt_environment }
+      salt_modules { FactoryBot.create_list :salt_module, 10, :salt_environments => [self.salt_environment] }
     end
   end
 

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

@@ -2,24 +2,24 @@ require 'test_plugin_helper'
 
 class ::ForemanSalt::Api::V2::SaltAutosignControllerTest < ActionController::TestCase
   setup do
-    @proxy = FactoryGirl.create(:smart_proxy, :with_salt_feature)
+    @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
     ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns((%w(foo bar baz)))
   end
 
   test 'should get index' do
-    get :index, :smart_proxy_id => @proxy.id
+    get :index, params: { :smart_proxy_id => @proxy.id }
     assert_response :success
   end
 
   test 'should create autosign' do
     ProxyAPI::Salt.any_instance.expects(:autosign_create).once.returns(true)
-    post :create, :smart_proxy_id => @proxy.id, :record => 'unicorn.example.com'
+    post :create, params: { :smart_proxy_id => @proxy.id, :record => 'unicorn.example.com' }
     assert_response :success
   end
 
   test 'should delete autosign' do
     ProxyAPI::Salt.any_instance.expects(:autosign_remove).once.returns(true)
-    delete :destroy, :smart_proxy_id => @proxy.id, :record => 'unicorn.example.com'
+    delete :destroy, params: { :smart_proxy_id => @proxy.id, :record => 'unicorn.example.com' }
     assert_response :success
   end
 end

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

@@ -2,20 +2,20 @@ require 'test_plugin_helper'
 
 class ::ForemanSalt::Api::V2::SaltEnvironmentsControllerTest < ActionController::TestCase
   test 'should get index' do
-    get :index, {}
+    get :index
     assert_response :success
     assert_template 'api/v2/salt_environments/index'
   end
 
   test 'should show environment' do
     environment = ForemanSalt::SaltEnvironment.create(:name => 'foo')
-    get :show, :id => environment.id
+    get :show, params: { :id => environment.id }
     assert_response :success
     assert_template 'api/v2/salt_environments/show'
   end
 
   test 'should create environment' do
-    post :create, :environment => { :name => 'unicorn' }
+    post :create, params: { :environment => { :name => 'unicorn' } }
     assert_response :success
     assert ForemanSalt::SaltEnvironment.find_by_name('unicorn')
     assert_template 'api/v2/salt_environments/create'
@@ -24,7 +24,7 @@ class ::ForemanSalt::Api::V2::SaltEnvironmentsControllerTest < ActionController:
   test 'should delete environment' do
     environment = ForemanSalt::SaltEnvironment.create(:name => 'foo.bar.baz')
     assert_difference('ForemanSalt::SaltEnvironment.count', -1) do
-      delete :destroy, :id => environment.id
+      delete :destroy, params: { :id => environment.id }
     end
     assert_response :success
   end

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

@@ -2,26 +2,26 @@ require 'test_plugin_helper'
 
 class ::ForemanSalt::Api::V2::SaltKeysControllerTest < ActionController::TestCase
   setup do
-    @proxy = FactoryGirl.create(:smart_proxy, :with_salt_feature)
+    @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
 
     ProxyAPI::Salt.any_instance.stubs(:key_list).returns('saltstack.example.com' => { 'state' => 'unaccepted',
                                                                                       'fingerprint' => '98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0' })
   end
 
   test 'should get index' do
-    get :index, :smart_proxy_id => @proxy.id
+    get :index, params: { :smart_proxy_id => @proxy.id }
     assert_response :success
   end
 
   test 'should update keys' do
     ProxyAPI::Salt.any_instance.expects(:key_accept).once.returns(true)
-    put :update, :smart_proxy_id => @proxy.id, :name => 'saltstack.example.com', :key => { :state => 'accepted' }
+    put :update, params: { :smart_proxy_id => @proxy.id, :name => 'saltstack.example.com', :key => { :state => 'accepted' } }
     assert_response :success
   end
 
   test 'should delete keys' do
     ProxyAPI::Salt.any_instance.expects(:key_delete).once.returns(true)
-    delete :destroy, :smart_proxy_id => @proxy.id, :name => 'saltstack.example.com'
+    delete :destroy, params: { :smart_proxy_id => @proxy.id, :name => 'saltstack.example.com' }
     assert_response :success
   end
 end

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

@@ -2,20 +2,20 @@ require 'test_plugin_helper'
 
 class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestCase
   test 'should get index' do
-    get :index, {}
+    get :index
     assert_response :success
     assert_template 'api/v2/salt_states/index'
   end
 
   test 'should show state' do
     state = ForemanSalt::SaltModule.create(:name => 'foo.bar.baz')
-    get :show, :id => state.id
+    get :show, params: { :id => state.id }
     assert_response :success
     assert_template 'api/v2/salt_states/show'
   end
 
   test 'should create state' do
-    post :create, :state => { :name => 'unicorn' }
+    post :create, params: { :state => { :name => 'unicorn' } }
     assert_response :success
     assert ForemanSalt::SaltModule.find_by_name('unicorn')
     assert_template 'api/v2/salt_states/create'
@@ -24,14 +24,14 @@ class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestC
   test 'should delete state' do
     state = ForemanSalt::SaltModule.create(:name => 'foo.bar.baz')
     assert_difference('ForemanSalt::SaltModule.count', -1) do
-      delete :destroy, :id => state.id
+      delete :destroy, params: { :id => state.id }
     end
     assert_response :success
   end
 
   context 'importing' do
     setup do
-      @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+      @proxy = FactoryBot.create :smart_proxy, :with_salt_feature
       @states = { 'env1' => %w(state1 state2 state3),
                   'env2' => %w(state1 state2) }
 
@@ -39,7 +39,7 @@ class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestC
     end
 
     test 'should import' do
-      post :import, :smart_proxy_id => @proxy.id
+      post :import, params: { :smart_proxy_id => @proxy.id }
 
       assert_response :success
 
@@ -50,32 +50,32 @@ class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestC
     end
 
     test 'should import only from a given environment' do
-      post :import, :smart_proxy_id => @proxy.id, :salt_environments => ['env2']
+      post :import, params: { :smart_proxy_id => @proxy.id, :salt_environments => ['env2'] }
       assert_response :success
       refute ::ForemanSalt::SaltEnvironment.where(:name => 'env1').first
       assert ::ForemanSalt::SaltEnvironment.where(:name => 'env2').first
     end
 
     test 'should limit actions to add' do
-      env   = FactoryGirl.create :salt_environment
-      state = FactoryGirl.create :salt_module, :salt_environments => [env]
+      env   = FactoryBot.create :salt_environment
+      state = FactoryBot.create :salt_module, :salt_environments => [env]
 
-      post :import, :smart_proxy_id => @proxy.id, :actions => ['add']
+      post :import, params: { :smart_proxy_id => @proxy.id, :actions => ['add'] }
       assert_response :success
       assert ::ForemanSalt::SaltModule.where(:id => state).first
       assert ::ForemanSalt::SaltModule.where(:name => 'state1').first
     end
 
     test 'should limit actions to remove' do
-      state = FactoryGirl.create :salt_module
-      post :import, :smart_proxy_id => @proxy.id, :actions => ['remove']
+      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
     end
 
     test 'dryrun should do nothing' do
-      post :import, :smart_proxy_id => @proxy.id, :dryrun => true
+      post :import, params: { :smart_proxy_id => @proxy.id, :dryrun => true }
       assert_response :success
       refute ::ForemanSalt::SaltModule.all.any?
       refute ::ForemanSalt::SaltEnvironment.all.any?

data/test/functional/minions_controller_test.rb

@@ -7,11 +7,11 @@ module ForemanSalt
       Setting[:restrict_registered_smart_proxies] = true
       Setting[:require_ssl_smart_proxies] = false
 
-      proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+      proxy = FactoryBot.create :smart_proxy, :with_salt_feature
       Resolv.any_instance.stubs(:getnames).returns([proxy.to_s])
 
-      host = FactoryGirl.create :host
-      get :node, :id => host, :format => 'yml'
+      host = FactoryBot.create :host
+      get :node, params: { :id => host, :format => 'yml' }
       assert_response :success
     end
   end

data/test/integration/salt_autosign_test.rb

@@ -4,7 +4,7 @@ require 'integration_test_helper'
 module ForemanSalt
   class SaltKeysTest < ActionDispatch::IntegrationTest
     setup do
-      @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+      @proxy = FactoryBot.create :smart_proxy, :with_salt_feature
 
       ::ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns(
         ['foo.example.com']

data/test/integration/salt_environment_test.rb

@@ -4,7 +4,7 @@ require 'integration_test_helper'
 module ForemanSalt
   class SaltEnvironmentTest < ActionDispatch::IntegrationTest
     test 'index page' do
-      FactoryGirl.create_list :salt_environment, 5
+      FactoryBot.create_list :salt_environment, 5
       assert_index_page(salt_environments_path, 'Salt Environment', 'New Salt Environment')
     end
 
@@ -16,7 +16,7 @@ module ForemanSalt
     end
 
     test 'edit page' do
-      salt_environment = FactoryGirl.create :salt_environment
+      salt_environment = FactoryBot.create :salt_environment
       visit salt_environments_path
       click_link salt_environment.name
       fill_in 'foreman_salt_salt_environment_name', :with => 'some_other_name'

data/test/integration/salt_keys_test.rb

@@ -4,7 +4,7 @@ require 'integration_test_helper'
 module ForemanSalt
   class SaltKeysTest < ActionDispatch::IntegrationTest
     setup do
-      @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+      @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' },

data/test/integration/salt_module_test.rb

@@ -12,12 +12,12 @@ module ForemanSalt
       ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
 
       # FIXME #12143
-      FactoryGirl.create(:permission, :name => 'view_salt_environments',
+      FactoryBot.create(:permission, :name => 'view_salt_environments',
                          :resource_type => 'ForemanSalt::SaltEnvironment')
     end
 
     test 'index page' do
-      FactoryGirl.create_list :salt_module, 5
+      FactoryBot.create_list :salt_module, 5
       assert_index_page(salt_modules_path, 'Salt State', 'New Salt State')
     end
 
@@ -29,7 +29,7 @@ module ForemanSalt
     end
 
     test 'edit page' do
-      salt_module = FactoryGirl.create :salt_module
+      salt_module = FactoryBot.create :salt_module
       visit salt_modules_path
       click_link salt_module.name
       fill_in :foreman_salt_salt_module_name, :with => 'some_other_name'
@@ -38,8 +38,8 @@ module ForemanSalt
     end
 
     test 'import states' do
-      proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
-      state = FactoryGirl.create :salt_module, :salt_environments => [FactoryGirl.create(:salt_environment)]
+      proxy = FactoryBot.create :smart_proxy, :with_salt_feature
+      state = FactoryBot.create :salt_module, :salt_environments => [FactoryBot.create(:salt_environment)]
 
       visit salt_modules_path
       click_link "Import from #{proxy.name}"

data/test/test_plugin_helper.rb

@@ -9,6 +9,6 @@ def assert_row_button(index_path, link_text, button_text, dropdown = false)
   end
 end
 
-# Add plugin to FactoryGirl's paths
-FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-FactoryGirl.reload
+# Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryBot.reload

data/test/unit/grains_importer_test.rb

@@ -2,6 +2,9 @@ require 'test_plugin_helper'
 
 module ForemanSalt
   class GrainsImporterTest < ActiveSupport::TestCase
+    include FactImporterIsolation
+    allow_transactions_for_any_importer
+
     setup do
       User.current = User.find_by_login 'admin'
       Setting[:create_new_host_when_facts_are_uploaded] = true

data/test/unit/host_extensions_test.rb

@@ -7,36 +7,36 @@ module ForemanSalt
     end
 
     test 'host has a salt smart proxy' do
-      host = FactoryGirl.create :host, :with_salt_proxy
+      host = FactoryBot.create :host, :with_salt_proxy
       assert host.salt_proxy.has_feature? 'Salt'
     end
 
     test 'smart_proxy_ids returns salt smart proxy' do
-      host = FactoryGirl.create :host, :with_salt_proxy
+      host = FactoryBot.create :host, :with_salt_proxy
       assert host.smart_proxy_ids.include? host.salt_proxy_id
     end
 
     test 'host params includes salt_master' do
-      host = FactoryGirl.create :host, :with_salt_proxy
+      host = FactoryBot.create :host, :with_salt_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 = FactoryGirl.create :hostgroup, :with_salt_proxy
-      host = FactoryGirl.create :host, :hostgroup => hostgroup
+      hostgroup = FactoryBot.create :hostgroup, :with_salt_proxy
+      host = FactoryBot.create :host, :hostgroup => hostgroup
       host.set_hostgroup_defaults
       assert_equal host.salt_proxy, hostgroup.salt_proxy
     end
 
     test 'host does not accept salt modules outside its environment' do
-      hosts_environment = FactoryGirl.create :salt_environment
-      other_environment = FactoryGirl.create :salt_environment
+      hosts_environment = FactoryBot.create :salt_environment
+      other_environment = FactoryBot.create :salt_environment
 
-      state = FactoryGirl.create :salt_module
+      state = FactoryBot.create :salt_module
       other_environment.salt_modules << state
 
-      host = FactoryGirl.create :host, :with_salt_proxy, :salt_environment => hosts_environment
+      host = FactoryBot.create :host, :with_salt_proxy, :salt_environment => hosts_environment
       host.salt_modules = [state]
 
       refute host.save
@@ -44,8 +44,8 @@ module ForemanSalt
     end
 
     test '#configuration? considers salt' do
-      host = FactoryGirl.build(:host)
-      proxy = FactoryGirl.build(:smart_proxy)
+      host = FactoryBot.build(:host)
+      proxy = FactoryBot.build(:smart_proxy)
 
       refute host.configuration?
       host.salt_proxy = proxy
@@ -54,7 +54,7 @@ module ForemanSalt
 
     context 'key handling' do
       before do
-        @host = FactoryGirl.create(:host, :with_salt_proxy, :managed, :build => true)
+        @host = FactoryBot.create(:host, :with_salt_proxy, :managed, :build => true)
         @key_stub = stub("key")
         ForemanSalt::SmartProxies::SaltKeys.expects(:find).at_least_once.with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
       end

data/test/unit/hostgroup_extensions_test.rb

@@ -7,49 +7,49 @@ module ForemanSalt
     end
 
     test 'host group has a salt smart proxy' do
-      hostgroup = FactoryGirl.create :hostgroup, :with_salt_proxy
+      hostgroup = FactoryBot.create :hostgroup, :with_salt_proxy
       assert hostgroup.salt_proxy.features.map(&:name).include? 'Salt'
     end
 
     test 'nested host group inherits salt modules from parent' do
-      parent = FactoryGirl.create :hostgroup, :with_salt_modules
-      child = FactoryGirl.create :hostgroup, :parent => parent
+      parent = FactoryBot.create :hostgroup, :with_salt_modules
+      child = FactoryBot.create :hostgroup, :parent => parent
       assert_equal [], parent.all_salt_modules - child.all_salt_modules
     end
 
     test 'child host group inherits salt proxy from child parent' do
-      parent = FactoryGirl.create :hostgroup
-      child_one = FactoryGirl.create :hostgroup, :with_salt_proxy, :parent => parent
-      child_two = FactoryGirl.create :hostgroup, :parent => child_one
+      parent = FactoryBot.create :hostgroup
+      child_one = FactoryBot.create :hostgroup, :with_salt_proxy, :parent => parent
+      child_two = FactoryBot.create :hostgroup, :parent => child_one
       assert_equal child_two.salt_proxy, child_one.salt_proxy
     end
 
     test 'child and parent salt modules are combined' do
-      environment = FactoryGirl.create :salt_environment
-      parent = FactoryGirl.create :hostgroup, :with_salt_modules, :salt_environment => environment
-      child = FactoryGirl.create :hostgroup, :with_salt_modules, :salt_environment => environment, :parent => parent
+      environment = FactoryBot.create :salt_environment
+      parent = FactoryBot.create :hostgroup, :with_salt_modules, :salt_environment => environment
+      child = FactoryBot.create :hostgroup, :with_salt_modules, :salt_environment => environment, :parent => parent
 
       total = parent.salt_modules.count + child.salt_modules.count
       assert_equal total, child.all_salt_modules.count
     end
 
     test 'child doesnt get modules from outside its environment' do
-      parent = FactoryGirl.create :hostgroup, :with_salt_modules
-      child = FactoryGirl.create :hostgroup, :with_salt_modules, :parent => parent
+      parent = FactoryBot.create :hostgroup, :with_salt_modules
+      child = FactoryBot.create :hostgroup, :with_salt_modules, :parent => parent
       assert_equal child.salt_modules.count, child.all_salt_modules.count
     end
 
     test 'inheritance when only parent has modules' do
-      parent = FactoryGirl.create :hostgroup, :with_salt_modules
-      child_one = FactoryGirl.create :hostgroup, :parent => parent
-      child_two = FactoryGirl.create :hostgroup, :parent => child_one
+      parent = FactoryBot.create :hostgroup, :with_salt_modules
+      child_one = FactoryBot.create :hostgroup, :parent => parent
+      child_two = FactoryBot.create :hostgroup, :parent => child_one
       assert_empty parent.all_salt_modules - child_two.all_salt_modules
     end
 
     test 'inheritance when no parents have modules' do
-      parent = FactoryGirl.create :hostgroup
-      child_one = FactoryGirl.create :hostgroup, :parent => parent
-      child_two = FactoryGirl.create :hostgroup, :with_salt_modules, :parent => child_one
+      parent = FactoryBot.create :hostgroup
+      child_one = FactoryBot.create :hostgroup, :parent => parent
+      child_two = FactoryBot.create :hostgroup, :with_salt_modules, :parent => child_one
       assert child_two.all_salt_modules.any?
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 10.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
@@ -202,8 +202,8 @@ test_files:
 - test/unit/highstate.json
 - test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
-- test/unit/report_importer_test.rb
 - test/unit/grains_importer_test.rb
 - test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
 - test/test_plugin_helper.rb