foreman_salt 14.0.0 → 14.1.0

data/test/integration/hosts_js_test.rb

@@ -15,28 +15,28 @@ module ForemanSalt
       as_admin do
         proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
         salt_environment = FactoryBot.create(:salt_environment)
-        @host = FactoryBot.create(:host, :salt_proxy => proxy, :salt_environment => salt_environment)
+        @host = FactoryBot.create(:host, salt_proxy: proxy, salt_environment: salt_environment)
         Setting::Salt.load_defaults
       end
     end
 
-    describe "hosts details run salt button" do
-      test "verify run salt button availabilty" do
+    describe 'hosts details run salt button' do
+      test 'verify run salt button availabilty' do
         Setting[:salt_hide_run_salt_button] = false
         visit hosts_path
         click_link @host.fqdn
-        assert page.has_link?("Run Salt")
+        assert page.has_link?('Run Salt')
       end
 
-      test "verify run salt button absence" do
+      test 'verify run salt button absence' do
         Setting[:salt_hide_run_salt_button] = true
         visit hosts_path
         click_link @host.fqdn
-        assert_not page.has_link?("Run Salt")
+        assert_not page.has_link?('Run Salt')
       end
     end
 
-    describe "hosts index salt multiple actions" do
+    describe 'hosts index salt multiple actions' do
       test 'change salt master action' do
         visit hosts_path
         check 'check_all'
@@ -51,13 +51,13 @@ module ForemanSalt
 
         # Hosts are added to cookie
         host_ids_on_cookie = JSON.parse(CGI.unescape(get_me_the_cookie('_ForemanSelectedhosts')&.fetch(:value)))
-        assert(host_ids_on_cookie.include?(@host.id))
+        assert_includes(host_ids_on_cookie, @host.id)
 
         within('#submit_multiple') do
           click_on('Change Salt Master')
         end
 
-        assert index_modal.visible?, "Modal window was shown"
+        assert index_modal.visible?, 'Modal window was shown'
         page.find('#proxy_proxy_id').find("option[value='#{@host.salt_proxy.id}']").select_option
 
         # remove hosts cookie on submit
@@ -80,13 +80,13 @@ module ForemanSalt
 
         # Hosts are added to cookie
         host_ids_on_cookie = JSON.parse(CGI.unescape(get_me_the_cookie('_ForemanSelectedhosts')&.fetch(:value)))
-        assert(host_ids_on_cookie.include?(@host.id))
+        assert_includes(host_ids_on_cookie, @host.id)
 
         within('#submit_multiple') do
           click_on('Change Salt Environment')
         end
 
-        assert index_modal.visible?, "Modal window was shown"
+        assert index_modal.visible?, 'Modal window was shown'
         page.find('#salt_environment_id').find("option[value='#{@host.salt_environment.id}']").select_option
 
         # remove hosts cookie on submit

data/test/integration/salt_autosign_test.rb

@@ -12,25 +12,25 @@ module ForemanSalt
     end
 
     test 'smart proxy page has autosign link' do
-      assert_row_button(smart_proxies_path, @proxy.name, 'Salt Autosign', true)
+      assert_row_button(smart_proxies_path, @proxy.name, 'Salt Autosign', dropdown: 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_link? 'Salt Autosign'
+      click_link 'Salt Autosign'
       assert page.has_title?("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)
+      visit smart_proxy_salt_autosign_index_path(smart_proxy_id: @proxy.id)
       assert find_link('Keys').visible?, 'Keys is not visible'
       assert has_title?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
       assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 
     test 'has list of autosign' do
-      visit smart_proxy_salt_autosign_index_path(:smart_proxy_id => @proxy.id)
+      visit smart_proxy_salt_autosign_index_path(smart_proxy_id: @proxy.id)
       assert has_content?('foo.example.com'), 'Missing autosign entry on index page'
     end
   end

data/test/integration/salt_environment_test.rb

@@ -10,7 +10,7 @@ module ForemanSalt
 
     test 'create new page' do
       assert_new_button(salt_environments_path, 'New Salt Environment', new_salt_environment_path)
-      fill_in 'foreman_salt_salt_environment_name', :with => 'common'
+      fill_in 'foreman_salt_salt_environment_name', with: 'common'
       assert_submit_button(salt_environments_path)
       assert page.has_link? 'common'
     end
@@ -19,7 +19,7 @@ module ForemanSalt
       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'
+      fill_in 'foreman_salt_salt_environment_name', with: 'some_other_name'
       assert_submit_button(salt_environments_path)
       assert page.has_link? 'some_other_name'
     end

data/test/integration/salt_keys_test.rb

@@ -15,36 +15,36 @@ module ForemanSalt
     end
 
     test 'smart proxy page has keys link' do
-      assert_row_button(smart_proxies_path, @proxy.name, 'Salt Keys', true)
+      assert_row_button(smart_proxies_path, @proxy.name, 'Salt Keys', dropdown: 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_link? 'Salt Keys'
+      click_link 'Salt Keys'
       assert page.has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
     end
 
     test 'index page' do
-      visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
+      visit smart_proxy_salt_keys_path(smart_proxy_id: @proxy.id)
       assert has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
       assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 
     test 'has list of keys' do
-      visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
+      visit smart_proxy_salt_keys_path(smart_proxy_id: @proxy.id)
       assert has_content?('saltclient01.example.com'), 'Missing key on index page'
       assert has_content?('98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1'), 'Missing fingerprint on index page'
     end
 
     test 'has accept link' do
       ProxyAPI::Salt.any_instance.stubs(:key_accept).returns(true)
-      assert_row_button(smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id), 'saltclient01.example.com', 'Accept', true)
+      assert_row_button(smart_proxy_salt_keys_path(smart_proxy_id: @proxy.id), 'saltclient01.example.com', 'Accept', dropdown: true)
     end
 
     test 'has reject link' do
       ProxyAPI::Salt.any_instance.stubs(:key_reject).returns(true)
-      assert_row_button(smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id), 'saltclient01.example.com', 'Reject', true)
+      assert_row_button(smart_proxy_salt_keys_path(smart_proxy_id: @proxy.id), 'saltclient01.example.com', 'Reject', dropdown: true)
     end
   end
 end

data/test/integration/salt_module_test.rb

@@ -6,7 +6,7 @@ module ForemanSalt
     setup do
       User.current = users :admin
 
-      states = %w(state1 state2 state3 state4)
+      states = %w[state1 state2 state3 state4]
       state_list = { 'env1' => states, 'env2' => states }
 
       ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
@@ -19,7 +19,7 @@ module ForemanSalt
 
     test 'create new page' do
       assert_new_button(salt_modules_path, 'New Salt State', new_salt_module_path)
-      fill_in 'foreman_salt_salt_module_name', :with => 'common'
+      fill_in 'foreman_salt_salt_module_name', with: 'common'
       assert_submit_button(salt_modules_path)
       assert page.has_link? 'common'
     end
@@ -28,24 +28,24 @@ module ForemanSalt
       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'
+      fill_in :foreman_salt_salt_module_name, with: 'some_other_name'
       assert_submit_button(salt_modules_path)
       assert page.has_link? 'some_other_name'
     end
 
     test 'import states' do
       proxy = FactoryBot.create :smart_proxy, :with_salt_feature
-      state = FactoryBot.create :salt_module, :salt_environments => [FactoryBot.create(:salt_environment)]
+      state = FactoryBot.create :salt_module, salt_environments: [FactoryBot.create(:salt_environment)]
 
       visit salt_modules_path
       click_link "Import from #{proxy.name}"
 
-      assert page.has_selector?('td', :text => 'env1'), 'Could not find env1 on importer page'
-      assert page.has_selector?('td', :text => 'Add'), 'Could not find env1 on importer page'
-      assert page.has_selector?('td', :text => 'state1, state2, state3, and state4'), 'Could not find states on importer page'
+      assert page.has_selector?('td', text: 'env1'), 'Could not find env1 on importer page'
+      assert page.has_selector?('td', text: 'Add'), 'Could not find env1 on importer page'
+      assert page.has_selector?('td', text: 'state1, state2, state3, and state4'), 'Could not find states on importer page'
 
-      assert page.has_selector?('td', :text => 'Remove'), 'Could not find remove on importer page'
-      assert page.has_selector?('td', :text => state.name), 'Could not find state to remove'
+      assert page.has_selector?('td', text: 'Remove'), 'Could not find remove on importer page'
+      assert page.has_selector?('td', text: state.name), 'Could not find state to remove'
 
       all('input.state_check').each { |checkbox| check(checkbox[:id]) }
 

data/test/integration/salt_variable_test.rb

@@ -15,8 +15,8 @@ module ForemanSalt
     test 'create new page' do
       state = FactoryBot.create :salt_module
       assert_new_button(salt_variables_path, 'New Salt Variable', new_salt_variable_path)
-      fill_in 'foreman_salt_salt_variable_key', :with => 'mykey'
-      select2(state.name, :from => 'foreman_salt_salt_variable_salt_module_id')
+      fill_in 'foreman_salt_salt_variable_key', with: 'mykey'
+      select2(state.name, from: 'foreman_salt_salt_variable_salt_module_id')
       assert_submit_button(salt_variables_path)
       assert page.has_link? 'mykey'
     end

data/test/test_plugin_helper.rb

@@ -1,7 +1,7 @@
 # This calls the main test_helper in Foreman-core
 require 'test_helper'
 
-def assert_row_button(index_path, link_text, button_text, dropdown = false)
+def assert_row_button(index_path, link_text, button_text, dropdown: false)
   visit index_path
   within(:xpath, "//tr[contains(.,'#{link_text}')]") do
     find('span.caret').click if dropdown

data/test/unit/grains_importer_test.rb

@@ -10,9 +10,9 @@ module ForemanSalt
       User.current = users :admin
       Setting[:create_new_host_when_facts_are_uploaded] = true
 
-      Operatingsystem.where(:name => 'CentOS', :major => '6', :minor => '5').delete_all
+      Operatingsystem.where(name: 'CentOS', major: '6', minor: '5').delete_all
 
-      grains = JSON.parse(File.read(File.join(Engine.root, 'test', 'unit', 'grains_centos.json')))
+      grains = JSON.parse(File.read(File.join(Foreman::Application.root, 'test', 'static_fixtures', 'facts', 'grains_centos.json')))
       @imported_host = ::Host::Managed.import_host grains['name'], 'salt'
       @imported_host.import_facts grains['facts'].with_indifferent_access
     end
@@ -26,7 +26,7 @@ module ForemanSalt
     end
 
     test 'nested facts have valid parents' do
-      parent = ::FactName.find_by_name('cpu_flags')
+      parent = ::FactName.find_by(name: 'cpu_flags')
       children = @imported_host.fact_values.with_fact_parent_id(parent)
       assert_not_empty children
       assert_empty children.map(&:fact_name).reject { |fact| fact.name =~ /\Acpu_flags#{FactName::SEPARATOR}[0-9]+/ }
@@ -34,33 +34,33 @@ module ForemanSalt
 
     # Parser
     test 'imported host has operating system' do
-      assert_equal @imported_host.os.to_label, 'CentOS 6.5'
+      assert_equal('CentOS 6.5', @imported_host.os.to_label)
     end
 
     test 'imported host operating system has deduced family' do
-      assert_equal @imported_host.os.family, 'Redhat'
+      assert_equal('Redhat', @imported_host.os.family)
     end
 
     test 'imported host has hardware model' do
-      assert_equal @imported_host.model.name, 'KVM'
+      assert_equal('KVM', @imported_host.model.name)
     end
 
     test 'imported host has architecture' do
-      assert_equal @imported_host.arch.name, 'x86_64'
+      assert_equal('x86_64', @imported_host.arch.name)
     end
 
     test 'imported host has primary ip' do
-      assert_equal @imported_host.ip, '10.7.13.141'
+      assert_equal('10.7.13.141', @imported_host.ip)
     end
 
     test 'imported host has primary mac' do
-      assert_equal @imported_host.mac, '52:54:00:35:30:2a'
+      assert_equal('52:54:00:35:30:2a', @imported_host.mac)
     end
 
     test 'imported host has additional interface' do
-      nic = @imported_host.interfaces.find_by_identifier('eth1')
-      assert_equal nic.mac, 'de:ad:be:ef:07:13'
-      assert_equal nic.ip, '1.2.3.4'
+      nic = @imported_host.interfaces.find_by(identifier: 'eth1')
+      assert_equal('de:ad:be:ef:07:13', nic.mac)
+      assert_equal('1.2.3.4', nic.ip)
     end
   end
 end

data/test/unit/host_extensions_test.rb

@@ -16,7 +16,7 @@ module ForemanSalt
     test 'smart_proxy_ids returns salt smart proxy' do
       host = FactoryBot.create :host
       host.salt_proxy = @proxy
-      assert host.smart_proxy_ids.include? host.salt_proxy_id
+      assert_includes host.smart_proxy_ids, host.salt_proxy_id
     end
 
     test 'host params includes salt_master' do
@@ -29,7 +29,7 @@ module ForemanSalt
     test 'host inherits salt proxy from host group' do
       hostgroup = FactoryBot.create :hostgroup
       hostgroup.salt_proxy = @proxy
-      host = FactoryBot.create :host, :hostgroup => hostgroup
+      host = FactoryBot.create :host, hostgroup: hostgroup
       host.set_hostgroup_defaults
       assert_equal host.salt_proxy, hostgroup.salt_proxy
     end
@@ -41,12 +41,12 @@ module ForemanSalt
       state = FactoryBot.create :salt_module
       other_environment.salt_modules << state
 
-      host = FactoryBot.create :host, :salt_environment => hosts_environment
+      host = FactoryBot.create :host, salt_environment: hosts_environment
       host.salt_proxy = @proxy
       host.salt_modules = [state]
 
       assert_not host.save
-      assert host.errors.full_messages.include? 'Salt states must be in the environment of the host'
+      assert_includes host.errors.full_messages, 'Salt states must be in the environment of the host'
     end
 
     test '#configuration? considers salt' do
@@ -60,12 +60,12 @@ module ForemanSalt
       before do
         @host = FactoryBot.create(:host, :managed)
         @host.salt_proxy = @proxy
-        stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf").
-          to_return(status: 200, body: "", headers: {})
+        stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf")
+          .to_return(status: 200, body: '', headers: {})
       end
 
       test 'host autosign is created when host is built' do
-        autosign_key = "asdfasdfasfasdf"
+        autosign_key = 'asdfasdfasfasdf'
         @host.expects(:generate_provisioning_key).returns(autosign_key)
         @host.build = true
         assert @host.save!
@@ -81,42 +81,42 @@ module ForemanSalt
       end
 
       test 'host returns autosign when deriving salt grains' do
-        autosign_key = "asdfasdfasfasdf"
+        autosign_key = 'asdfasdfasfasdf'
         expected_hash = { @host.autosign_grain_name => autosign_key }
         @host.salt_autosign_key = autosign_key
-        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(use_autosign: true) }
       end
 
       test 'host returns empty hash when deriving salt grains without any given' do
         expected_hash = {}
-        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(use_autosign: true) }
       end
 
       test 'host returns empty hash when deriving salt grains without autosign' do
         expected_hash = {}
-        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => false) }
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(use_autosign: false) }
       end
 
       test 'host returns host param grains when deriving salt grains' do
-        expected_hash = { "Some key": "Some value", "Another key": "An extraordinary value" }
+        expected_hash = { "Some key": 'Some value', "Another key": 'An extraordinary value' }
         @host.host_params[@host.host_params_grains_name] = expected_hash
-        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => false) }
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(use_autosign: false) }
       end
 
       test 'host returns only host param grains when deriving salt grains' do
-        expected_hash = { "Some key": "Some value", "Another key": "An extraordinary value" }
+        expected_hash = { "Some key": 'Some value', "Another key": 'An extraordinary value' }
         @host.host_params[@host.host_params_grains_name] = expected_hash
-        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(use_autosign: true) }
       end
 
       test 'host returns host param grains plus autosign when deriving salt grains' do
-        autosign_key = "asdfasdfasfasdf"
-        host_param_grains = { "Some key": "Some value",
-                              "Another key": "An extraordinary value" }
+        autosign_key = 'asdfasdfasfasdf'
+        host_param_grains = { "Some key": 'Some value',
+                              "Another key": 'An extraordinary value' }
         expected_hash = host_param_grains.merge(@host.autosign_grain_name => autosign_key)
         @host.salt_autosign_key = autosign_key
         @host.host_params[@host.host_params_grains_name] = host_param_grains
-        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(use_autosign: true) }
       end
     end
   end

data/test/unit/hostgroup_extensions_test.rb

@@ -10,19 +10,19 @@ module ForemanSalt
     test 'host group has a salt smart proxy' do
       hostgroup = FactoryBot.create :hostgroup
       hostgroup.salt_proxy = @proxy
-      assert hostgroup.salt_proxy.features.map(&:name).include? 'Salt'
+      assert_includes hostgroup.salt_proxy.features.map(&:name), 'Salt'
     end
 
     test 'nested host group inherits salt modules from parent' do
       parent = FactoryBot.create :hostgroup, :with_salt_modules
-      child = FactoryBot.create :hostgroup, :parent => parent
+      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 = FactoryBot.create :hostgroup
-      child_one = FactoryBot.create :hostgroup, :parent => parent, :salt_proxy => @proxy
-      child_two = FactoryBot.create :hostgroup, :parent => child_one
+      child_one = FactoryBot.create :hostgroup, parent: parent, salt_proxy: @proxy
+      child_two = FactoryBot.create :hostgroup, parent: child_one
       assert_not_nil parent
       assert_not_nil child_one
       assert_not_nil child_two
@@ -34,8 +34,8 @@ module ForemanSalt
     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, :salt_environment => environment
-      child_two = FactoryBot.create :hostgroup, :parent => child_one
+      child_one = FactoryBot.create :hostgroup, parent: parent, salt_environment: environment
+      child_two = FactoryBot.create :hostgroup, parent: child_one
       assert_not_nil parent
       assert_not_nil child_one
       assert_not_nil child_two
@@ -46,8 +46,8 @@ module ForemanSalt
 
     test 'child and parent salt modules are combined' do
       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
+      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
@@ -55,21 +55,21 @@ module ForemanSalt
 
     test 'child doesnt get modules from outside its environment' do
       parent = FactoryBot.create :hostgroup, :with_salt_modules
-      child = FactoryBot.create :hostgroup, :with_salt_modules, :parent => parent
+      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 = FactoryBot.create :hostgroup, :with_salt_modules
-      child_one = FactoryBot.create :hostgroup, :parent => parent
-      child_two = FactoryBot.create :hostgroup, :parent => child_one
+      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 = FactoryBot.create :hostgroup
-      child_one = FactoryBot.create :hostgroup, :parent => parent
-      child_two = FactoryBot.create :hostgroup, :with_salt_modules, :parent => child_one
+      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

data/test/unit/report_importer_test.rb

@@ -13,27 +13,27 @@ module ForemanSalt
     end
 
     test 'importing report creates a host' do
-      assert_not Host.find_by_name(@host)
+      assert_not Host.find_by(name: @host)
       ForemanSalt::ReportImporter.import(@report)
-      assert Host.find_by_name(@host)
+      assert Host.find_by(name: @host)
     end
 
     test 'importing report updates host status' do
       HostStatus::ConfigurationStatus.any_instance.stubs(:relevant?).returns(true)
       ForemanSalt::ReportImporter.import(@report)
-      assert Host.find_by_name(@host).get_status(HostStatus::ConfigurationStatus).error?
+      assert Host.find_by(name: @host).get_status(HostStatus::ConfigurationStatus).error?
     end
 
     test 'importing report has correct status' do
       ForemanSalt::ReportImporter.import(@report)
-      status = Host.find_by_name(@host).reports.last.status
-      assert_equal status['applied'], 9
-      assert_equal status['failed'], 3
+      status = Host.find_by(name: @host).reports.last.status
+      assert_equal(9, status['applied'])
+      assert_equal(3, status['failed'])
     end
 
     test 'report has salt origin and expected content' do
       ForemanSalt::ReportImporter.import(@report)
-      report = Host.find_by_name(@host).reports.last
+      report = Host.find_by(name: @host).reports.last
       assert_equal 'Salt', report.origin
       assert_equal 'pkg_|-postfix_|-postfix_|-installed', report.logs.first.source.value
       assert_equal 'Package postfix is already installed.', report.logs.first.message.value
@@ -41,11 +41,11 @@ module ForemanSalt
 
     test 'report with pchanges has salt origin and expected content' do
       ForemanSalt::ReportImporter.import(@report_pchanges)
-      report = Host.find_by_name(@host).reports.last
+      report = Host.find_by(name: @host).reports.last
       status = report.status
       assert_equal 'Salt', report.origin
       assert_equal 'file_|-/etc/motd_|-/etc/motd_|-managed', report.logs.first.source.value
-      assert_equal status['pending'], 1
+      assert_equal(1, status['pending'])
     end
 
     test 'import returns Array of reports including host and its name' do

data/test/unit/salt_keys_test.rb

@@ -7,7 +7,7 @@ class SaltKeysTest < ActiveSupport::TestCase
     # Fix for 1.8.7 OpenStruct http://stackoverflow.com/questions/9079441/populate-select-tag-ruby-rails
     OpenStruct.__send__(:define_method, :id) { @table[:id] }
 
-    @proxy = OpenStruct.new(:id => 1, :url => 'http://dummy.example.com:9090')
+    @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' },
@@ -38,7 +38,7 @@ class SaltKeysTest < ActiveSupport::TestCase
   end
 
   test 'finds a key by name' do
-    assert_equal ForemanSalt::SmartProxies::SaltKeys.find(@proxy, 'saltstack.example.com').name, 'saltstack.example.com'
+    assert_equal('saltstack.example.com', ForemanSalt::SmartProxies::SaltKeys.find(@proxy, 'saltstack.example.com').name)
   end
 
   test 'find keys by state' do

data/test/unit/salt_modules_test.rb

@@ -6,12 +6,12 @@ class SaltModulesTest < ActiveSupport::TestCase
   end
 
   test 'salt module has a valid name' do
-    salt_module = ForemanSalt::SaltModule.new(:name => 'foo.bar.baz')
+    salt_module = ForemanSalt::SaltModule.new(name: 'foo.bar.baz')
     assert_valid salt_module
   end
 
   test 'salt module has invalid name' do
-    salt_module = ForemanSalt::SaltModule.new(:name => '&bad$name')
+    salt_module = ForemanSalt::SaltModule.new(name: '&bad$name')
     refute_valid salt_module, :name, /alphanumeric/
   end
 end

data/test/unit/salt_variables_test.rb

@@ -7,25 +7,25 @@ class SaltVariablesTest < ActiveSupport::TestCase
   end
 
   test 'salt variable has a salt module' do
-    salt_variable = ForemanSalt::SaltVariable.new(:key => 'awesome_key', :salt_module_id => @state.id)
+    salt_variable = ForemanSalt::SaltVariable.new(key: 'awesome_key', salt_module_id: @state.id)
     assert_valid salt_variable
-    assert_equal true, salt_variable.salt?
+    assert salt_variable.salt?
     assert_equal @state.id, salt_variable.salt_module.id
   end
 
   test 'salt variable is referencing a LookupValue' do
-    salt_variable = ForemanSalt::SaltVariable.new(:key => 'awesome_key', :salt_module_id => @state.id)
+    salt_variable = ForemanSalt::SaltVariable.new(key: 'awesome_key', salt_module_id: @state.id)
     assert salt_variable.lookup_values.count.zero?
-    LookupValue.create(:value => "[1.2.3.4,2.3.4.5]", :match => "domain =  mydomain.net", :lookup_key => salt_variable)
-    assert salt_variable.lookup_values.count == 1
+    LookupValue.create(value: '[1.2.3.4,2.3.4.5]', match: 'domain =  mydomain.net', lookup_key: salt_variable)
+    assert_equal(1, salt_variable.lookup_values.count)
   end
 
   test 'should cast default_value to hash' do
-    salt_variable = ForemanSalt::SaltVariable.new(:key => 'awesome_key',
-                                                  :salt_module_id => @state.id,
-                                                  :key_type => 'hash',
-                                                  :default_value => "{\r\n  \"bat\": \"man\"\r\n}\r\n",
-                                                  :override => true)
+    salt_variable = ForemanSalt::SaltVariable.new(key: 'awesome_key',
+                                                  salt_module_id: @state.id,
+                                                  key_type: 'hash',
+                                                  default_value: "{\r\n  \"bat\": \"man\"\r\n}\r\n",
+                                                  override: true)
     salt_variable.save
     assert salt_variable.default_value.is_a?(Hash)
   end