foreman_salt 1.1.0 → 1.1.1

data/app/services/foreman_salt/report_importer.rb

@@ -57,22 +57,22 @@ module ForemanSalt
     def import_log_messages
       @raw.each do |resource, result|
         level = if result['changes'].blank? && result['result']
-          :info
-        elsif result['result'] == false
-          :err
-        else
-          :notice
-        end
+                  :info
+                elsif !result['result']
+                  :err
+                else
+                  :notice
+                end
 
         source = Source.find_or_create(resource)
 
         message = if result['changes']['diff']
-          result['changes']['diff']
-        elsif !result['comment'].blank?
-          result['comment']
-        else
-          'No message available'
-        end
+                    result['changes']['diff']
+                  elsif !result['comment'].blank?
+                    result['comment']
+                  else
+                    'No message available'
+                  end
 
         message = Message.find_or_create(message)
         Log.create(:message_id => message.id, :source_id => source.id, :report => @report, :level => level)
@@ -91,14 +91,14 @@ module ForemanSalt
       @raw.each do |resource, result|
         next unless result.is_a? Hash
 
-        if result['result'] == true
+        if result['result']
           success += 1
           if resource.match(/^service_/) && result['comment'].include?('restarted')
             restarted += 1
           elsif !result['changes'].blank?
             changed += 1
           end
-        elsif result['result'] == false
+        elsif !result['result']
           if resource.match(/^service_/) && result['comment'].include?('restarted')
             restarted_failed += 1
           else

data/app/services/foreman_salt/smart_proxies/salt_keys.rb

@@ -3,14 +3,14 @@ module ForemanSalt
 
     attr_reader :name, :state, :fingerprint, :smart_proxy_id
 
-     def initialize opts
+     def initialize(opts)
        @name, @state, @fingerprint, @smart_proxy_id = opts.flatten
      end
 
        class << self
 
          def all(proxy)
-           raise ::Foreman::Exception.new(N_("Must specify a Smart Proxy to use")) if proxy.nil?
+           raise ::Foreman::Exception.new(N_('Must specify a Smart Proxy to use')) if proxy.nil?
 
            unless (keys = Rails.cache.read("saltkeys_#{proxy.id}"))
              api = ProxyAPI::Salt.new({:url => proxy.url})
@@ -33,14 +33,14 @@ module ForemanSalt
        end
 
     def accept
-      raise ::Foreman::Exception.new(N_("unable to re-accept an accepted key")) unless state == "unaccepted"
+      raise ::Foreman::Exception.new(N_('unable to re-accept an accepted key')) unless state == 'unaccepted'
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
       ProxyAPI::Salt.new({:url => proxy.url}).key_accept name
     end
 
     def reject
-      raise ::Foreman::Exception.new(N_("unable to reject an accepted key")) unless state == "unaccepted"
+      raise ::Foreman::Exception.new(N_('unable to reject an accepted key')) unless state == 'unaccepted'
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
       ProxyAPI::Salt.new({:url => proxy.url}).key_reject name
@@ -56,12 +56,12 @@ module ForemanSalt
     def to_param
       name
     end
-    
+
     def to_s
       name
     end
 
-    def <=> other
+    def <=>(other)
       self.name <=> other.name
     end
   end

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

@@ -1,7 +1,7 @@
 <%= form_tag url_for(:controller => 'foreman_salt/salt_autosign', :smart_proxy_id => @proxy, :action => 'index') do |f| %>
   <div class="clearfix">
     <div class="input">
-    <%= label_tag(_("Name")) %> <%= text_field_tag(:id, "", :size => 60) %> <%= submit_tag _('Save'), :class => "btn btn-success" %>
+    <%= label_tag(_('Name')) %> <%= text_field_tag(:id, '', :size => 60) %> <%= submit_tag _('Save'), :class => 'btn btn-success' %>
     </div>
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
-<% title _("Autosign entries for %s") % @proxy %>
+<% 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), 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'}) %>
 
 <table class='table table-bordered table-striped table-condensed'>
   <tr>
-    <th><%= _("Name") %></th>
+    <th><%= _('Name') %></th>
     <th></th>
   </tr>
   <% @autosign.each do |key| %>

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

@@ -1,3 +1,3 @@
-<% title _("New Autosign Entry") %>
+<% title _('New Autosign Entry') %>
 
 <%= render :partial => 'form' %>

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

@@ -1,4 +1,4 @@
-<% title(_("Edit Salt Environment %s") % @salt_environment) %>
+<% title(_('Edit Salt Environment %s') % @salt_environment) %>
 
 <%= render :partial => 'form' %>
 

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

@@ -1,10 +1,10 @@
-<% title _("Salt Environments") %>
+<% title _('Salt Environments') %>
 
-<% title_actions button_group(display_link_if_authorized(_("New Salt Environment"), hash_for_new_salt_environment_path)) %>
+<% title_actions button_group(display_link_if_authorized(_('New Salt Environment'), hash_for_new_salt_environment_path)) %>
 
 <table class="table table-bordered table-striped">
   <tr>
-    <th><%= sort :name, :as => s_("SaltEnvironment|Name") %></th>
+    <th><%= sort :name, :as => s_('SaltEnvironment|Name') %></th>
     <th></th>
   </tr>
   <% for salt_environment in @salt_environments %>
@@ -12,7 +12,7 @@
       <td><%=link_to_if_authorized h(salt_environment.name), hash_for_edit_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer) %></td>
       <td>
         <%= action_buttons(display_delete_if_authorized hash_for_salt_environment_path(:id => salt_environment).merge(:auth_object => salt_environment, :authorizer => authorizer),
-                            :confirm => _("Delete %s?") % salt_environment.name) %>
+                            :confirm => _('Delete %s?') % salt_environment.name) %>
       </td>
     </tr>
   <% end %>

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

@@ -1,4 +1,4 @@
-<% title _("New Salt Environment") %>
+<% title _('New Salt Environment') %>
 
 <%= render :partial => 'form' %>
 

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

@@ -1,13 +1,13 @@
-<% title _("Salt Keys on %s") % @proxy %>
-<% search_bar _("Filter %s") % salt_keys_state_filter %>
+<% 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) %>
 
 <table class='table table-bordered table-striped table-condensed'>
   <tr>
-    <th><%= _("Key Name") %></th>
-    <th><%= _("State") %></th>
-    <th><%= _("Fingerprint") %></th>
+    <th><%= _('Key Name') %></th>
+    <th><%= _('State') %></th>
+    <th><%= _('Fingerprint') %></th>
     <th></th>
   </tr>
   <% @keys.each do |key| %>
@@ -17,9 +17,9 @@
         <td><%= key.fingerprint %></td>
         <td>
           <%= action_buttons(
-                  if key.state == "unaccepted"
-                    [display_link_if_authorized(_("Accept"), hash_for_smart_proxy_salt_key_accept_path.merge(:state => params[:state], :salt_key_id => key)),
-                    display_link_if_authorized(_("Reject"), hash_for_smart_proxy_salt_key_reject_path.merge(:state => params[:state], :salt_key_id => key))]
+                  if key.state == 'unaccepted'
+                    [display_link_if_authorized(_('Accept'), hash_for_smart_proxy_salt_key_accept_path.merge(:state => params[:state], :salt_key_id => key)),
+                    display_link_if_authorized(_('Reject'), hash_for_smart_proxy_salt_key_reject_path.merge(:state => params[:state], :salt_key_id => key))]
                   end,
                   display_delete_if_authorized(hash_for_smart_proxy_salt_key_path(:smart_proxy_id => @proxy, :id => key, :state => params[:state], :class => 'delete'))
                   )

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

@@ -1,4 +1,4 @@
-<% title(_("Edit Salt State %s") % @salt_module) %>
+<% title(_('Edit Salt State %s') % @salt_module) %>
 
 <%= render :partial => 'form' %>
 

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

@@ -1,10 +1,10 @@
-<% title _("Salt States") %>
+<% title _('Salt States') %>
 
-<% title_actions button_group(display_link_if_authorized(_("New Salt State"), hash_for_new_salt_module_path)) %>
+<% title_actions button_group(display_link_if_authorized(_('New Salt State'), hash_for_new_salt_module_path)) %>
 
 <table class="table table-bordered table-striped">
   <tr>
-    <th><%= sort :name, :as => s_("SaltModule|Name") %></th>
+    <th><%= sort :name, :as => s_('SaltModule|Name') %></th>
     <th></th>
   </tr>
   <% for salt_module in @salt_modules %>
@@ -12,7 +12,7 @@
       <td><%=link_to_if_authorized h(salt_module.name), hash_for_edit_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer) %></td>
       <td>
         <%= action_buttons(display_delete_if_authorized hash_for_salt_module_path(:id => salt_module).merge(:auth_object => salt_module, :authorizer => authorizer),
-                            :confirm => _("Delete %s?") % salt_module.name) %>
+                            :confirm => _('Delete %s?') % salt_module.name) %>
       </td>
     </tr>
   <% end %>

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

@@ -1,4 +1,4 @@
-<% title _("New Salt State") %>
+<% title _('New Salt State') %>
 
 <%= render :partial => 'form' %>
 

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
 
   scope :salt, :path => '/salt' do
-    match "/node/:name" => 'hosts#salt_external_node', :constraints => { :name => /[^\.][\w\.-]+/ }
+    match '/node/:name' => 'hosts#salt_external_node', :constraints => { :name => /[^\.][\w\.-]+/ }
 
     resources :salt_environments, :controller => 'foreman_salt/salt_environments' do
       collection do

data/db/migrate/20140817210214_create_salt_modules.rb

@@ -1,7 +1,7 @@
 class CreateSaltModules < ActiveRecord::Migration
   def self.up
     create_table :salt_modules do |t|
-      t.string      :name, :default => "", :null => false
+      t.string      :name, :default => '', :null => false
       t.timestamps
     end
 

data/db/migrate/20140920232200_create_salt_environments.rb

@@ -1,7 +1,7 @@
 class CreateSaltEnvironments < ActiveRecord::Migration
   def self.up
     create_table :salt_environments do |t|
-      t.string :name, :default => "", :null => false
+      t.string :name, :default => '', :null => false
       t.timestamps
     end
 

data/db/seeds.d/75-salt-seeds.rb

@@ -1,5 +1,5 @@
 # Create feature for Smart Proxy
-Feature.find_or_create_by_name("Salt")
+Feature.find_or_create_by_name('Salt')
 
 # Add new viewing permissions to Viewer role
 viewer = Role.find_by_name('Viewer')

data/lib/foreman_salt/engine.rb

@@ -11,13 +11,13 @@ module ForemanSalt
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
     if defined? ForemanTasks
-      initializer "foreman_salt.require_dynflow", :before => "foreman_tasks.initialize_dynflow" do |app|
+      initializer 'foreman_salt.require_dynflow', :before => 'foreman_tasks.initialize_dynflow' do |app|
         ForemanTasks.dynflow.require!
       end
     end
 
     # Add any db migrations
-    initializer "foreman_salt.load_app_instance_data" do |app|
+    initializer 'foreman_salt.load_app_instance_data' do |app|
       app.config.paths['db/migrate'] += ForemanSalt::Engine.paths['db/migrate'].existent
     end
 
@@ -38,7 +38,7 @@ module ForemanSalt
           :after    => :common_parameters
 
         divider :top_menu, :parent => :configure_menu,
-          :caption => "Salt",
+          :caption => 'Salt',
           :after   => :common_parameters
 
         security_block :hosts do |map|
@@ -47,36 +47,36 @@ module ForemanSalt
         end
 
         security_block :salt_environments do |map|
-          permission :create_salt_environments, {:'foreman_salt/salt_environments' => [:new, :create]}, :resource_type => "ForemanSalt::SaltEnvironment"
-          permission :view_salt_environments, {:'foreman_salt/salt_environments' => [:index, :show, :auto_complete_search]}, :resource_type => "ForemanSalt::SaltEnvironment"
-          permission :edit_salt_environments, {:'foreman_salt/salt_environments' => [:update, :edit]},:resource_type => "ForemanSalt::SaltEnvironment"
-          permission :destroy_salt_environments, {:'foreman_salt/salt_environments' => [:destroy]}, :resource_type => "ForemanSalt::SaltEnvironment"
+          permission :create_salt_environments, {:'foreman_salt/salt_environments' => [:new, :create]}, :resource_type => 'ForemanSalt::SaltEnvironment'
+          permission :view_salt_environments, {:'foreman_salt/salt_environments' => [:index, :show, :auto_complete_search]}, :resource_type => 'ForemanSalt::SaltEnvironment'
+          permission :edit_salt_environments, {:'foreman_salt/salt_environments' => [:update, :edit]},:resource_type => 'ForemanSalt::SaltEnvironment'
+          permission :destroy_salt_environments, {:'foreman_salt/salt_environments' => [:destroy]}, :resource_type => 'ForemanSalt::SaltEnvironment'
         end
 
         security_block :salt_modules do |map|
-          permission :create_salt_modules, {:'foreman_salt/salt_modules' => [:new, :create]}, :resource_type => "ForemanSalt::SaltModule"
-          permission :view_salt_modules, {:'foreman_salt/salt_modules' => [:index, :show, :auto_complete_search]}, :resource_type => "ForemanSalt::SaltModule"
-          permission :edit_salt_modules, {:'foreman_salt/salt_modules' => [:update, :edit]},:resource_type => "ForemanSalt::SaltModule"
-          permission :destroy_salt_modules, {:'foreman_salt/salt_modules' => [:destroy]}, :resource_type => "ForemanSalt::SaltModule"
+          permission :create_salt_modules, {:'foreman_salt/salt_modules' => [:new, :create]}, :resource_type => 'ForemanSalt::SaltModule'
+          permission :view_salt_modules, {:'foreman_salt/salt_modules' => [:index, :show, :auto_complete_search]}, :resource_type => 'ForemanSalt::SaltModule'
+          permission :edit_salt_modules, {:'foreman_salt/salt_modules' => [:update, :edit]},:resource_type => 'ForemanSalt::SaltModule'
+          permission :destroy_salt_modules, {:'foreman_salt/salt_modules' => [:destroy]}, :resource_type => 'ForemanSalt::SaltModule'
         end
 
         security_block :salt_keys do |map|
-          permission :view_smart_proxies_salt_keys, {:'foreman_salt/salt_keys' => [:index]}, :resource_type => "SmartProxy"
-          permission :destroy_smart_proxies_salt_keys, {:'foreman_salt/salt_keys' => [:destroy]},:resource_type => "SmartProxy"
-          permission :edit_smart_proxies_salt_keys, {:'foreman_salt/salt_keys' => [:accept, :reject]}, :resource_type => "SmartProxy"
+          permission :view_smart_proxies_salt_keys, {:'foreman_salt/salt_keys' => [:index]}, :resource_type => 'SmartProxy'
+          permission :destroy_smart_proxies_salt_keys, {:'foreman_salt/salt_keys' => [:destroy]},:resource_type => 'SmartProxy'
+          permission :edit_smart_proxies_salt_keys, {:'foreman_salt/salt_keys' => [:accept, :reject]}, :resource_type => 'SmartProxy'
         end
 
         security_block :salt_autosign do |map|
-          permission :destroy_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:destroy]}, :resource_type => "SmartProxy"
-          permission :create_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:new, :create]}, :resource_type => "SmartProxy"
-          permission :view_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:index]}, :resource_type => "SmartProxy"
+          permission :destroy_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:destroy]}, :resource_type => 'SmartProxy'
+          permission :create_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:new, :create]}, :resource_type => 'SmartProxy'
+          permission :view_smart_proxies_salt_autosign, {:'foreman_salt/salt_autosign' => [:index]}, :resource_type => 'SmartProxy'
         end
 
         security_block :api do |map|
-          permission :create_reports, {:'foreman_salt/api/v2/jobs' => [:upload]}, :resource_type => "Report"
+          permission :create_reports, {:'foreman_salt/api/v2/jobs' => [:upload]}, :resource_type => 'Report'
         end
 
-        role "Salt admin", [:saltrun_hosts, :create_salt_modules, :view_salt_modules, :edit_salt_modules, :destroy_salt_modules,
+        role 'Salt admin', [:saltrun_hosts, :create_salt_modules, :view_salt_modules, :edit_salt_modules, :destroy_salt_modules,
                             :view_smart_proxies_salt_keys, :destroy_smart_proxies_salt_keys, :edit_smart_proxies_salt_keys,
                             :create_smart_proxies_salt_autosign, :view_smart_proxies_salt_autosign, :destroy_smart_proxies_salt_autosign,
                             :create_salt_environments, :view_salt_environments, :edit_salt_environments, :destroy_salt_environments]
@@ -107,7 +107,7 @@ module ForemanSalt
         ::Api::V2::HostsController.send :include, ForemanSalt::Concerns::SmartProxyAuthExtensions
         ::Api::V2::ReportsController.send :include, ForemanSalt::Concerns::SmartProxyAuthExtensions
       rescue => e
-        puts "ForemanSalt: skipping engine hook (#{e.to_s})"
+        puts "ForemanSalt: skipping engine hook (#{e})"
       end
     end
   end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = "1.1.0"
+  VERSION = '1.1.1'
 end

data/lib/foreman_salt.rb

@@ -3,7 +3,7 @@ require 'foreman_salt/engine'
 begin
   require 'foreman-tasks'
 rescue LoadError
-  # Foreman Tasks isn't available
+  puts 'ForemanTasks is not available, async tasks disabled.'
 end
 
 module ForemanSalt

data/lib/tasks/foreman_salt_tasks.rake

@@ -1,19 +1,25 @@
-# Tasks
 namespace :foreman_salt do
-  namespace :example do
-    desc 'Example Task'
-    task :task => :environment do
-      # Task goes here
+  task :rubocop do
+    begin
+      require 'rubocop/rake_task'
+      RuboCop::RakeTask.new(:rubocop_salt) do |task|
+        task.patterns = ["#{ForemanSalt::Engine.root}/app/**/*.rb",
+                         "#{ForemanSalt::Engine.root}/lib/**/*.rb",
+                         "#{ForemanSalt::Engine.root}/test/**/*.rb"]
+      end
+    rescue
+      puts "Rubocop not loaded."
     end
+
+    Rake::Task['rubocop_salt'].invoke
   end
 end
 
-# Tests
 namespace :test do
-  desc "Test ForemanSalt"
+  desc 'Test ForemanSalt'
   Rake::TestTask.new(:foreman_salt) do |t|
     test_dir = File.join(File.dirname(__FILE__), '../..', 'test')
-    t.libs << ["test",test_dir]
+    t.libs << ['test',test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
   end
@@ -25,7 +31,8 @@ end
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
+  Rake::Task['jenkins:unit'].enhance do
     Rake::Task['test:foreman_salt'].invoke
+    Rake::Task['foreman_salt:rubocop'].invoke
   end
 end

data/test/factories/foreman_salt_factories.rb

@@ -1,9 +1,9 @@
 FactoryGirl.define do
-  factory :salt_module, :class => "ForemanSalt::SaltModule" do
+  factory :salt_module, :class => 'ForemanSalt::SaltModule' do
     sequence(:name) { |n| "module#{n}" }
   end
 
-  factory :salt_environment, :class => "ForemanSalt::SaltEnvironment" do
+  factory :salt_environment, :class => 'ForemanSalt::SaltEnvironment' do
     sequence(:name) { |n| "module#{n}" }
   end
 end

data/test/functional/hosts_controller_test.rb

@@ -10,7 +10,7 @@ class HostsControllerTest < ActionController::TestCase
     Resolv.any_instance.stubs(:getnames).returns([proxy.to_s])
 
     host = FactoryGirl.create :host
-    get :salt_external_node, {:name => host.name, :format => "yml"}
+    get :salt_external_node, {:name => host.name, :format => 'yml'}
     assert_response :success
   end
 end

data/test/integration/salt_autosign_test.rb

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

data/test/integration/salt_environment_test.rb

@@ -3,23 +3,23 @@ require 'test_plugin_helper'
 module ForemanSalt
   class SaltEnvironmentTest < ActionDispatch::IntegrationTest
 
-    test "index page" do
+    test 'index page' do
       FactoryGirl.create_list :salt_environment, 50
-      assert_index_page(salt_environments_path, "Salt Environment", "New Salt Environment")
+      assert_index_page(salt_environments_path, 'Salt Environment', 'New Salt Environment')
     end
 
-    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"
+    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'
       assert_submit_button(salt_environments_path)
       assert page.has_link? 'common'
     end
 
-    test "edit page" do
+    test 'edit page' do
       salt_environment = FactoryGirl.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

@@ -7,39 +7,39 @@ module ForemanSalt
 
       ::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"},
-         "saltclient01.example.com" => {"state"=>"unaccepted", "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1"},
-         "saltclient02.example.com" => {"state"=>"unaccepted", "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2"},
-         "saltclient03.example.com "=> {"state"=>"rejected",   "fingerprint"=>"98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3"}
+          'saltstack.example.com' => {'state'=>'accepted', 'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c0'},
+          'saltclient01.example.com'=> {'state'=>'unaccepted', 'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c1'},
+          'saltclient02.example.com'=> {'state'=>'unaccepted', 'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c2'},
+          'saltclient03.example.com' => {'state'=>'rejected',   'fingerprint'=>'98:c2:63:c1:57:59:bc:bd:f1:ef:5a:38:b2:e9:71:c3'}
         }
       )
     end
 
-    test "smart proxy page has keys link" do
-      assert_row_button(smart_proxies_path, @proxy.name, 'Salt Keys', dropdown = true)
+    test 'smart proxy page has keys link' do
+      assert_row_button(smart_proxies_path, @proxy.name, 'Salt Keys', true)
     end
 
-    test "index page" do
+    test 'index page' do
       visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
-      assert find_link('Autosign').visible?, "Autosign is not visible"
-      assert has_content?("Salt Keys on #{@proxy.hostname}"), "Page title does not appear"
-      assert has_content?("Displaying"), "Pagination 'Display ...' does not appear"
+      assert find_link('Autosign').visible?, 'Autosign is not visible'
+      assert has_content?("Salt Keys on #{@proxy.hostname}"), 'Page title does not appear'
+      assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 
-    test "has list of keys" do
+    test 'has list of keys' do
       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"
+      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
+    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', dropdown = true)
+      assert_row_button(smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id), 'saltclient01.example.com', 'Accept', true)
     end
 
-    test "has reject link" do
+    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', dropdown = true)
+      assert_row_button(smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id), 'saltclient01.example.com', 'Reject', true)
     end
   end
 end

data/test/integration/salt_module_test.rb

@@ -3,23 +3,23 @@ require 'test_plugin_helper'
 module ForemanSalt
   class SaltModuleTest < ActionDispatch::IntegrationTest
 
-    test "index page" do
+    test 'index page' do
       FactoryGirl.create_list :salt_module, 50
-      assert_index_page(salt_modules_path, "Salt State", "New Salt State")
+      assert_index_page(salt_modules_path, 'Salt State', 'New Salt State')
     end
 
-    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"
+    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'
       assert_submit_button(salt_modules_path)
       assert page.has_link? 'common'
     end
 
-    test "edit page" do
+    test 'edit page' do
       salt_module = FactoryGirl.create :salt_module
       visit salt_modules_path
-      click_link salt_module.name 
-      fill_in "foreman_salt_salt_module_name", :with => "some_other_name"
+      click_link salt_module.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

data/test/test_plugin_helper.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 def assert_row_button(index_path, link_text, button_text, dropdown = false)
   visit index_path
   within(:xpath, "//tr[contains(.,'#{link_text}')]") do
-    find("i.caret").click if dropdown
+    find('i.caret').click if dropdown
     click_link(button_text)
   end
 end