2
0

fix(rubocop): add fixes using rubocop --safe-auto-correct

This commit is contained in:
Imran Iqbal 2019-10-11 20:21:28 +01:00
parent bc2cc2cadf
commit 62f82a4334
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
9 changed files with 41 additions and 25 deletions

18
Vagrantfile vendored
View File

@ -1,24 +1,24 @@
# frozen_string_literal: true
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = '2'
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/trusty64" config.vm.box = 'ubuntu/trusty64'
config.vm.hostname = "salt" config.vm.hostname = 'salt'
config.vm.synced_folder "./", "/srv/salt", id: "vagrant-root" config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root'
config.ssh.forward_agent = true config.ssh.forward_agent = true
config.vm.provider :virtualbox do |vb| config.vm.provider :virtualbox do |vb|
# Use VBoxManage to customize the VM. For example to change memory: # Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "1024"] vb.customize ['modifyvm', :id, '--memory', '1024']
end
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :box
end end
config.cache.scope = :box if Vagrant.has_plugin?('vagrant-cachier')
# Set up salt-master and minion # Set up salt-master and minion
config.vm.provision "shell", path: "dev/setup-salt.sh" config.vm.provision 'shell', path: 'dev/setup-salt.sh'
end end

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
@ -14,10 +16,10 @@ version =
control 'salt packages' do control 'salt packages' do
title 'should be installed' title 'should be installed'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe package(p) do describe package(p) do
it { should be_installed } it { should be_installed }
its('version') { should eq version } its('version') { should eq version }

View File

@ -1,10 +1,12 @@
# frozen_string_literal: true
control 'salt services' do control 'salt services' do
title 'should be running' title 'should be running'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe service(p) do describe service(p) do
it { should be_enabled } it { should be_enabled }
it { should be_running } it { should be_running }

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
@ -9,10 +11,10 @@ version =
control 'salt packages' do control 'salt packages' do
title 'should be installed' title 'should be installed'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe package(p) do describe package(p) do
it { should be_installed } it { should be_installed }
its('version') { should eq version } its('version') { should eq version }

View File

@ -1,10 +1,12 @@
# frozen_string_literal: true
control 'salt services' do control 'salt services' do
title 'should be running' title 'should be running'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe service(p) do describe service(p) do
it { should be_enabled } it { should be_enabled }
it { should be_running } it { should be_running }

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
@ -13,10 +15,10 @@ version =
control 'salt packages' do control 'salt packages' do
title 'should be installed' title 'should be installed'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe package(p) do describe package(p) do
it { should be_installed } it { should be_installed }
its('version') { should eq version } its('version') { should eq version }

View File

@ -1,10 +1,12 @@
# frozen_string_literal: true
control 'salt services' do control 'salt services' do
title 'should be running' title 'should be running'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe service(p) do describe service(p) do
it { should be_enabled } it { should be_enabled }
it { should be_running } it { should be_running }

View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
@ -18,10 +20,10 @@ version =
control 'salt packages' do control 'salt packages' do
title 'should be installed' title 'should be installed'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe package(p) do describe package(p) do
it { should be_installed } it { should be_installed }
its('version') { should eq version } its('version') { should eq version }

View File

@ -1,10 +1,12 @@
# frozen_string_literal: true
control 'salt services' do control 'salt services' do
title 'should be running' title 'should be running'
%w( %w[
salt-master salt-master
salt-minion salt-minion
).each do |p| ].each do |p|
describe service(p) do describe service(p) do
it { should be_enabled } it { should be_enabled }
it { should be_running } it { should be_running }