Skip to content

Commit

Permalink
fix(rubocop): add fixes using rubocop --safe-auto-correct
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Oct 11, 2019
1 parent bc2cc2c commit 62f82a4
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 25 deletions.
18 changes: 9 additions & 9 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# frozen_string_literal: true

# -*- mode: ruby -*-
# vi: set ft=ruby :

# 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|
config.vm.box = "ubuntu/trusty64"
config.vm.hostname = "salt"
config.vm.synced_folder "./", "/srv/salt", id: "vagrant-root"
config.vm.box = 'ubuntu/trusty64'
config.vm.hostname = 'salt'
config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root'

config.ssh.forward_agent = true

config.vm.provider :virtualbox do |vb|
# Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "1024"]
end
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :box
vb.customize ['modifyvm', :id, '--memory', '1024']
end
config.cache.scope = :box if Vagrant.has_plugin?('vagrant-cachier')

# 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
6 changes: 4 additions & 2 deletions test/integration/v201707-py2/controls/pkgs_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
Expand All @@ -14,10 +16,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201707-py2/controls/service_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201803-py2/controls/pkgs_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
Expand All @@ -9,10 +11,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201803-py2/controls/service_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201902-py2/controls/pkgs_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
Expand All @@ -13,10 +15,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201902-py2/controls/service_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201902-py3/controls/pkgs_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
Expand All @@ -18,10 +20,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
Expand Down
6 changes: 4 additions & 2 deletions test/integration/v201902-py3/controls/service_spec.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
Expand Down

0 comments on commit 62f82a4

Please sign in to comment.