foreman_salt 5.0.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1aa26e9f75b7b0673e373a1bfb7b7c6a1e7333
-  data.tar.gz: cb9ea975a7a1ea549cf2f6006a3ae88ce49f1361
+  metadata.gz: feb89e35b3867722b4e8be153d07aa9d726c39bb
+  data.tar.gz: c0cc7b621377daf0d949ce033c3e79d521fb3652
 SHA512:
-  metadata.gz: af94628121430ff29a6cefaf22cd0e882d6b3f5ff80d412b8c9ce890c6338f74983f71f251716f8012012ae3c13d1e8dd1e0fd6382f29638ad8af10f61698e34
-  data.tar.gz: 827eda4f3ef2e520e782e4f0d69b01d35bb4a8e0494e0cd93de351eba54ca373734d64d763d1685ec37ede0c397b2736c306e62db7ae5e06bf4bd256914a3cd4
+  metadata.gz: 3f9b14758af01ec653d545faad1547002ed3c6a8541ed4933deea5cf1254f866fc2a124cec1d29cf3a8896700bd98858d52bf8404ebe913d17ca852753df87f5
+  data.tar.gz: 34e8ebac0aaaabce008600299026dfa61e45652ad8e3191c0ab5e737d2736cf15d11d18d4aab642f83dfb2c0b70d2f1004664c546e9a80f6d72476579db28005

data/app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb

@@ -4,7 +4,7 @@ module ForemanSalt
   module Api
     module V2
       class SaltAutosignController < ::ForemanSalt::Api::V2::BaseController
-        before_filter :find_proxy, :setup_proxy
+        before_action :find_proxy, :setup_proxy
 
         api :GET, '/salt_autosign/:smart_proxy_id', N_('List all autosign records')
         param :smart_proxy_id, :identifier_dottable, :required => true

data/app/controllers/foreman_salt/api/v2/salt_environments_controller.rb

@@ -2,7 +2,7 @@ module ForemanSalt
   module Api
     module V2
       class SaltEnvironmentsController < ::ForemanSalt::Api::V2::BaseController
-        before_filter :find_resource, :except => [:index, :create]
+        before_action :find_resource, :except => [:index, :create]
 
         api :GET, '/salt_environments', N_('List all Salt environments')
         param_group :search_and_pagination, ::Api::V2::BaseController

data/app/controllers/foreman_salt/api/v2/salt_keys_controller.rb

@@ -2,8 +2,8 @@ module ForemanSalt
   module Api
     module V2
       class SaltKeysController < ::ForemanSalt::Api::V2::BaseController
-        before_filter :find_proxy
-        before_filter :find_key, :only => [:update, :destroy]
+        before_action :find_proxy
+        before_action :find_key, :only => [:update, :destroy]
 
         api :GET, '/salt_keys/:smart_proxy_id', N_('List all Salt keys')
         param :smart_proxy_id, :identifier_dottable, :required => true

data/app/controllers/foreman_salt/api/v2/salt_minions_controller.rb

@@ -2,7 +2,7 @@ module ForemanSalt
   module Api
     module V2
       class SaltMinionsController < ::ForemanSalt::Api::V2::BaseController
-        before_filter :find_resource, :except => [:index]
+        before_action :find_resource, :except => [:index]
 
         api :GET, '/salt_minions', N_('List all Salt Minions')
         param_group :search_and_pagination, ::Api::V2::BaseController

data/app/controllers/foreman_salt/api/v2/salt_states_controller.rb

@@ -4,9 +4,9 @@ module ForemanSalt
       class SaltStatesController < ::ForemanSalt::Api::V2::BaseController
         include StateImporter
 
-        before_filter :find_resource, :except => [:index, :create, :import]
-        before_filter :find_proxy, :only => :import
-        before_filter :find_environment, :only => :index
+        before_action :find_resource, :except => [:index, :create, :import]
+        before_action :find_proxy, :only => :import
+        before_action :find_environment, :only => :index
 
         api :GET, '/salt_states', N_('List all Salt states')
         param :salt_environment_id, :identifier_dottable, :required => false, :desc => N_('Limit to a specific environment')

data/app/controllers/foreman_salt/minions_controller.rb

@@ -2,7 +2,7 @@ module ForemanSalt
   class MinionsController < ::ForemanSalt::ApplicationController
     include ::Foreman::Controller::SmartProxyAuth
 
-    before_filter :find_resource, :only => [:node, :run]
+    before_action :find_resource, :only => [:node, :run]
     add_smart_proxy_filters :node, :features => 'Salt'
 
     def node
@@ -84,42 +84,3 @@ module ForemanSalt
     end
   end
 end
-
-=begin
-Minions controller? BANANA!!!
-
-────────────▀▄───█───▄▀
-───────────▄▄▄█▄▄█▄▄█▄▄▄
-────────▄▀▀═════════════▀▀▄
-───────█═══════════════════█
-──────█═════════════════════█
-─────█════════▄▄▄▄▄▄▄════════█
-────█════════█████████════════█
-────█═══════██▀─────▀██═══════█
-───███████████──█▀█──███████████
-───███████████──▀▀▀──███████████
-────█═══════▀█▄─────▄█▀═══════█
-────█═════════▀█████▀═════════█
-────█═════════════════════════█
-────█═════════════════════════█
-────█═══════█▀█▀█▀█▀█▀█═══════█
-────█═══════▀▄───────▄▀═══════█
-────█═════════▀▄█▄█▄▀═════════█
-────█═════════════════════════█
-───▐▓▓▌═════════════════════▐▓▓▌
-───▐▐▓▓▌▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▐▓▓▌▌
-───█══▐▓▄▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▄▓▌══█
-──█══▌═▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌═▐══█
-──█══█═▐▓▓▓▓▓▓▄▄▄▄▄▄▄▓▓▓▓▓▓▌═█══█
-──█══█═▐▓▓▓▓▓▓▐██▀██▌▓▓▓▓▓▓▌═█══█
-──█══█═▐▓▓▓▓▓▓▓▀▀▀▀▀▓▓▓▓▓▓▓▌═█══█
-──█══█▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓█══█
-─▄█══█▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌█══█▄
-─█████▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌─█████
-─██████▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌─██████
-──▀█▀█──▐▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▌───█▀█▀
-─────────▐▓▓▓▓▓▓▌▐▓▓▓▓▓▓▌
-──────────▐▓▓▓▓▌──▐▓▓▓▓▌
-─────────▄████▀────▀████▄
-─────────▀▀▀▀────────▀▀▀▀
-=end

data/app/controllers/foreman_salt/salt_environments_controller.rb

@@ -2,7 +2,7 @@ module ForemanSalt
   class SaltEnvironmentsController < ::ForemanSalt::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
 
-    before_filter :find_resource, :only => [:edit, :update, :destroy]
+    before_action :find_resource, :only => [:edit, :update, :destroy]
 
     def index
       @salt_environments = resource_base.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -3,8 +3,8 @@ module ForemanSalt
     include Foreman::Controller::AutoCompleteSearch
     include StateImporter
 
-    before_filter :find_resource, :only => [:edit, :update, :destroy]
-    before_filter :find_proxy, :only => :import
+    before_action :find_resource, :only => [:edit, :update, :destroy]
+    before_action :find_proxy, :only => :import
 
     def index
       @salt_modules = resource_base.search_for(params[:search], :order => params[:order]).includes(:salt_environments).paginate(:page => params[:page])
@@ -70,7 +70,6 @@ module ForemanSalt
     def apply_changes
       if params[:changed].blank?
         notice _('No changes found')
-        redirect_to salt_modules_path
       else
         params[:changed].each do |environment, states|
           next unless states[:add] || states[:remove]
@@ -81,8 +80,8 @@ module ForemanSalt
 
         clean_orphans
         notice _('Successfully imported')
-        redirect_to salt_modules_path
       end
+      redirect_to salt_modules_path
     end
   end
 end

data/app/controllers/foreman_salt/state_importer.rb

@@ -18,7 +18,7 @@ module ForemanSalt
 
       environments ||= new.keys + old.keys
 
-      environments.each do |environment| # rubocop:disable Style/Next
+      environments.each do |environment|
         old_states = old[environment] || []
         new_states = new[environment] || []
 

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

@@ -93,7 +93,7 @@ module ForemanSalt
           key = ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn)
           key.accept unless key.nil?
         rescue Foreman::Exception => e
-           Rails.logger.warn("Unable to accept key for #{fqdn}: #{e}")
+          Rails.logger.warn("Unable to accept key for #{fqdn}: #{e}")
         end
       end
 
@@ -102,7 +102,7 @@ module ForemanSalt
           key = ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn)
           key.delete unless key.nil?
         rescue Foreman::Exception => e
-         Rails.logger.warn("Unable to delete key for #{fqdn}: #{e}")
+          Rails.logger.warn("Unable to delete key for #{fqdn}: #{e}")
         end
       end
     end

data/app/services/foreman_salt/fact_importer.rb

@@ -75,7 +75,7 @@ module ForemanSalt
       hash.each do |fact_name, value|
         name_parts = fact_name.split(FactName::SEPARATOR)
 
-        name_parts.inject([]) do |memo, name| # rubocop:disable Style/EachWithObject
+        name_parts.inject([]) do |memo, name|
           memo += [name]
           key = memo.join(FactName::SEPARATOR)
           new_facts[key] ||= name_parts == memo ? value : nil

data/app/services/foreman_salt/report_importer.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class ReportImporter # rubocop:disable Metrics/ClassLength
+  class ReportImporter
     delegate :logger, :to => :Rails
     attr_reader :report
 
@@ -115,9 +115,7 @@ module ForemanSalt
                      result['duration']
                    end
         # Convert duration from milliseconds to seconds
-        if duration.is_a? Float
-          duration = duration / 1000
-        end
+        duration /= 1000 if duration.is_a? Float
 
         time[resource] = duration || 0
       end

data/app/views/foreman_salt/salt_autosign/index.html.erb

@@ -1,6 +1,6 @@
 <% title _('Autosign entries for %s') % @proxy %>
 
-<% title_actions display_link_if_authorized(_('Keys'), hash_for_smart_proxy_salt_keys_path), display_link_if_authorized(_('New'), {:controller => 'foreman_salt/salt_autosign', :action => 'new', :smart_proxy_id => @proxy, :auth_object => @proxy, :permission => 'create_smart_proxies_salt_keys'}) %>
+<% title_actions display_link_if_authorized(_('Keys'), hash_for_smart_proxy_salt_keys_path, :class => 'btn btn-default'), display_link_if_authorized(_('New'), {:controller => 'foreman_salt/salt_autosign', :action => 'new', :smart_proxy_id => @proxy, :auth_object => @proxy, :permission => 'create_smart_proxies_salt_keys'}, :class => 'btn btn-primary') %>
 
 <table class='table table-bordered table-striped table-condensed'>
   <tr>

data/app/views/foreman_salt/salt_environments/index.html.erb

@@ -1,6 +1,6 @@
 <% title _('Salt Environments') %>
 
-<% title_actions button_group(display_link_if_authorized(_('New Salt Environment'), hash_for_new_salt_environment_path)) %>
+<% title_actions button_group(new_link(_('New Salt Environment'))) %>
 
 <table class="table table-bordered table-striped">
   <tr>

data/app/views/foreman_salt/salt_keys/index.erb

@@ -1,7 +1,7 @@
 <% title _('Salt Keys on %s') % @proxy %>
 <% search_bar _('Filter %s') % salt_keys_state_filter %>
 
-<% title_actions display_link_if_authorized(_('Autosign'), hash_for_smart_proxy_salt_autosign_index_path) %>
+<% title_actions display_link_if_authorized(_('Autosign'), hash_for_smart_proxy_salt_autosign_index_path, :class => 'btn btn-default') %>
 
 <table class='table table-bordered table-striped table-condensed'>
   <tr>

data/app/views/foreman_salt/salt_modules/index.html.erb

@@ -1,7 +1,7 @@
 <% title _('Salt States') %>
 
 <% title_actions import_from_proxies,
-                 button_group(display_link_if_authorized(_('New Salt State'), hash_for_new_salt_module_path)) %>
+                 button_group(new_link(_('New Salt State'))) %>
 
 
 <table class="table table-bordered table-striped">

data/lib/foreman_salt/engine.rb

@@ -43,7 +43,7 @@ module ForemanSalt
       Apipie.configuration.checksum_path += ['/salt/api/']
     end
 
-    initializer 'foreman_salt.register_plugin', :after => :finisher_hook do
+    initializer 'foreman_salt.register_plugin', :before => :finisher_hook do
       require 'foreman_salt/plugin'
     end
 

data/lib/foreman_salt/plugin.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_salt do
-  requires_foreman '>= 1.11'
+  requires_foreman '>= 1.12'
 
   apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '5.0.1'
+  VERSION = '6.0.0'
 end

data/lib/tasks/foreman_salt_tasks.rake

@@ -22,16 +22,13 @@ namespace :test do
     t.libs << ['test', test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
+    t.warning = false
   end
 end
 
-Rake::Task[:test].enhance do
-  Rake::Task['test:foreman_salt'].invoke
-end
+Rake::Task[:test].enhance ['test:foreman_salt']
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance do
-    Rake::Task['test:foreman_salt'].invoke
-  end
+  Rake::Task['jenkins:unit'].enhance ['test:foreman_salt', 'foreman_salt:rubocop']
 end

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

@@ -1,27 +1,25 @@
 require 'test_plugin_helper'
 
-module ForemanSalt
-  class Api::V2::SaltAutosignControllerTest < ActionController::TestCase
-    setup do
-      @proxy = FactoryGirl.create(:smart_proxy, :with_salt_feature)
-      ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns((%w(foo bar baz)))
-    end
+class ::ForemanSalt::Api::V2::SaltAutosignControllerTest < ActionController::TestCase
+  setup do
+    @proxy = FactoryGirl.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
-      assert_response :success
-    end
+  test 'should get index' do
+    get :index, :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'
-      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'
+    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'
-      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'
+    assert_response :success
   end
 end

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

@@ -1,33 +1,31 @@
 require 'test_plugin_helper'
 
-module ForemanSalt
-  class Api::V2::SaltEnvironmentsControllerTest < ActionController::TestCase
-    test 'should get index' do
-      get :index, {}
-      assert_response :success
-      assert_template 'api/v2/salt_environments/index'
-    end
+class ::ForemanSalt::Api::V2::SaltEnvironmentsControllerTest < ActionController::TestCase
+  test 'should get index' do
+    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
-      assert_response :success
-      assert_template 'api/v2/salt_environments/show'
-    end
+  test 'should show environment' do
+    environment = ForemanSalt::SaltEnvironment.create(:name => 'foo')
+    get :show, :id => environment.id
+    assert_response :success
+    assert_template 'api/v2/salt_environments/show'
+  end
 
-    test 'should create environment' do
-      post :create, :environment => { :name => 'unicorn' }
-      assert_response :success
-      assert ForemanSalt::SaltEnvironment.find_by_name('unicorn')
-      assert_template 'api/v2/salt_environments/create'
-    end
+  test 'should create environment' do
+    post :create, :environment => { :name => 'unicorn' }
+    assert_response :success
+    assert ForemanSalt::SaltEnvironment.find_by_name('unicorn')
+    assert_template 'api/v2/salt_environments/create'
+  end
 
-    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
-      end
-      assert_response :success
+  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
     end
+    assert_response :success
   end
 end

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

@@ -1,29 +1,27 @@
 require 'test_plugin_helper'
 
-module ForemanSalt
-  class Api::V2::SaltKeysControllerTest < ActionController::TestCase
-    setup do
-      @proxy = FactoryGirl.create(:smart_proxy, :with_salt_feature)
+class ::ForemanSalt::Api::V2::SaltKeysControllerTest < ActionController::TestCase
+  setup do
+    @proxy = FactoryGirl.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
+    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
-      assert_response :success
-    end
+  test 'should get index' do
+    get :index, :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' }
-      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' }
+    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'
-      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'
+    assert_response :success
   end
 end

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

@@ -1,86 +1,84 @@
 require 'test_plugin_helper'
 
-module ForemanSalt
-  class Api::V2::SaltStatesControllerTest < ActionController::TestCase
-    test 'should get index' do
-      get :index, {}
-      assert_response :success
-      assert_template 'api/v2/salt_states/index'
-    end
+class ::ForemanSalt::Api::V2::SaltStatesControllerTest < ActionController::TestCase
+  test 'should get index' do
+    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
-      assert_response :success
-      assert_template 'api/v2/salt_states/show'
-    end
+  test 'should show state' do
+    state = ForemanSalt::SaltModule.create(:name => 'foo.bar.baz')
+    get :show, :id => state.id
+    assert_response :success
+    assert_template 'api/v2/salt_states/show'
+  end
 
-    test 'should create state' do
-      post :create, :state => { :name => 'unicorn' }
-      assert_response :success
-      assert ForemanSalt::SaltModule.find_by_name('unicorn')
-      assert_template 'api/v2/salt_states/create'
-    end
+  test 'should create state' do
+    post :create, :state => { :name => 'unicorn' }
+    assert_response :success
+    assert ForemanSalt::SaltModule.find_by_name('unicorn')
+    assert_template 'api/v2/salt_states/create'
+  end
 
-    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
-      end
-      assert_response :success
+  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
     end
+    assert_response :success
+  end
 
-    context 'importing' do
-      setup do
-        @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
-        @states = { 'env1' => %w(state1 state2 state3),
-                    'env2' => %w(state1 state2) }
+  context 'importing' do
+    setup do
+      @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+      @states = { 'env1' => %w(state1 state2 state3),
+                  'env2' => %w(state1 state2) }
 
-        ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(@states)
-      end
+      ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(@states)
+    end
 
-      test 'should import' do
-        post :import, :smart_proxy_id => @proxy.id
+    test 'should import' do
+      post :import, :smart_proxy_id => @proxy.id
 
-        assert_response :success
+      assert_response :success
 
-        @states.each do |env, states|
-          environment = ::ForemanSalt::SaltEnvironment.find_by_name(env)
-          assert_empty environment.salt_modules.map(&:name) - states
-        end
+      @states.each do |env, states|
+        environment = ::ForemanSalt::SaltEnvironment.find_by_name(env)
+        assert_empty environment.salt_modules.map(&:name) - states
       end
+    end
 
-      test 'should import only from a given environment' do
-        post :import, :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 import only from a given environment' do
+      post :import, :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]
+    test 'should limit actions to add' do
+      env   = FactoryGirl.create :salt_environment
+      state = FactoryGirl.create :salt_module, :salt_environments => [env]
 
-        post :import, :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
+      post :import, :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']
-        assert_response :success
-        refute ::ForemanSalt::SaltModule.where(:id => state).first
-        refute ::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']
+      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
-        assert_response :success
-        refute ::ForemanSalt::SaltModule.all.any?
-        refute ::ForemanSalt::SaltEnvironment.all.any?
-      end
+    test 'dryrun should do nothing' do
+      post :import, :smart_proxy_id => @proxy.id, :dryrun => true
+      assert_response :success
+      refute ::ForemanSalt::SaltModule.all.any?
+      refute ::ForemanSalt::SaltEnvironment.all.any?
     end
   end
 end

data/test/integration/salt_autosign_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'integration_test_helper'
 
 module ForemanSalt
   class SaltKeysTest < ActionDispatch::IntegrationTest

data/test/integration/salt_environment_test.rb

@@ -1,9 +1,10 @@
 require 'test_plugin_helper'
+require 'integration_test_helper'
 
 module ForemanSalt
   class SaltEnvironmentTest < ActionDispatch::IntegrationTest
     test 'index page' do
-      FactoryGirl.create_list :salt_environment, 50
+      FactoryGirl.create_list :salt_environment, 5
       assert_index_page(salt_environments_path, 'Salt Environment', 'New Salt Environment')
     end
 

data/test/integration/salt_keys_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'integration_test_helper'
 
 module ForemanSalt
   class SaltKeysTest < ActionDispatch::IntegrationTest

data/test/integration/salt_module_test.rb

@@ -1,4 +1,5 @@
 require 'test_plugin_helper'
+require 'integration_test_helper'
 
 module ForemanSalt
   class SaltModuleTest < ActionDispatch::IntegrationTest

data/test/unit/grains_importer_test.rb

@@ -9,10 +9,8 @@ module ForemanSalt
       Operatingsystem.where(:name => 'CentOS', :major => '6', :minor => '5').delete_all
 
       grains = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'grains_centos.json')))
-      host  = grains['name']
-      facts = HashWithIndifferentAccess.new(grains['facts'])
-
-      (@imported_host, _) = ::Host::Managed.import_host_and_facts host, facts
+      @imported_host = ::Host::Managed.import_host grains['name'], 'salt'
+      @imported_host.import_facts grains['facts'].with_indifferent_access
     end
 
     test 'importing salt grains creates a host' do

data/test/unit/host_extensions_test.rb

@@ -54,7 +54,7 @@ module ForemanSalt
 
     context 'key handling' do
       before do
-        @host = FactoryGirl.create(:host, :with_salt_proxy, :build => true)
+        @host = FactoryGirl.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -162,7 +162,7 @@ files:
 - test/unit/salt_modules_test.rb
 homepage: http://github.com/theforeman/foreman_salt
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -185,22 +185,22 @@ signing_key:
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
-- test/factories/foreman_salt_factories.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/functional/minions_controller_test.rb
-- test/integration/salt_autosign_test.rb
+- test/integration/salt_module_test.rb
 - test/integration/salt_environment_test.rb
+- test/integration/salt_autosign_test.rb
 - test/integration/salt_keys_test.rb
-- test/integration/salt_module_test.rb
-- test/unit/grains_centos.json
+- test/test_plugin_helper.rb
 - test/unit/grains_importer_test.rb
-- test/unit/highstate.json
-- test/unit/salt_keys_test.rb
-- test/unit/salt_modules_test.rb
+- test/unit/grains_centos.json
 - test/unit/host_extensions_test.rb
-- test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
-- test/test_plugin_helper.rb
+- test/unit/hostgroup_extensions_test.rb
+- test/unit/salt_modules_test.rb
+- test/unit/highstate.json
+- test/unit/salt_keys_test.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_keys_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/factories/foreman_salt_factories.rb