Browse Source

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

tags/v0.59.5
Imran Iqbal 5 years ago
parent
commit
62f82a4334
No account linked to committer's email address
9 changed files with 41 additions and 25 deletions
  1. +9
    -9
      Vagrantfile
  2. +4
    -2
      test/integration/v201707-py2/controls/pkgs_spec.rb
  3. +4
    -2
      test/integration/v201707-py2/controls/service_spec.rb
  4. +4
    -2
      test/integration/v201803-py2/controls/pkgs_spec.rb
  5. +4
    -2
      test/integration/v201803-py2/controls/service_spec.rb
  6. +4
    -2
      test/integration/v201902-py2/controls/pkgs_spec.rb
  7. +4
    -2
      test/integration/v201902-py2/controls/service_spec.rb
  8. +4
    -2
      test/integration/v201902-py3/controls/pkgs_spec.rb
  9. +4
    -2
      test/integration/v201902-py3/controls/service_spec.rb

+ 9
- 9
Vagrantfile View File

# 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.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.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"]
end
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :box
vb.customize ['modifyvm', :id, '--memory', '1024']
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

+ 4
- 2
test/integration/v201707-py2/controls/pkgs_spec.rb View File

# frozen_string_literal: true

version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
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 }

+ 4
- 2
test/integration/v201707-py2/controls/service_spec.rb View File

# 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 }

+ 4
- 2
test/integration/v201803-py2/controls/pkgs_spec.rb View File

# frozen_string_literal: true

version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
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 }

+ 4
- 2
test/integration/v201803-py2/controls/service_spec.rb View File

# 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 }

+ 4
- 2
test/integration/v201902-py2/controls/pkgs_spec.rb View File

# frozen_string_literal: true

version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
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 }

+ 4
- 2
test/integration/v201902-py2/controls/service_spec.rb View File

# 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 }

+ 4
- 2
test/integration/v201902-py3/controls/pkgs_spec.rb View File

# frozen_string_literal: true

version = version =
case platform[:family] case platform[:family]
when 'redhat' when 'redhat'
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 }

+ 4
- 2
test/integration/v201902-py3/controls/service_spec.rb View File

# 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 }

Loading…
Cancel
Save