diff --git a/Gemfile b/Gemfile index 28ae3f7..098e753 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ group :syntax do gem 'rubocop', '~> 1.87.0' gem 'rubocop-performance', '~> 1.26.0' gem 'rubocop-rake', '~> 0.7.1' - gem 'rubocop-rspec', '~> 3.7.0' + gem 'rubocop-rspec', '~> 3.10.0' end group :test do diff --git a/spec/acceptance/suites/default/10_updaterepos_spec.rb b/spec/acceptance/suites/default/10_updaterepos_spec.rb index edb24a2..a22b4ef 100644 --- a/spec/acceptance/suites/default/10_updaterepos_spec.rb +++ b/spec/acceptance/suites/default/10_updaterepos_spec.rb @@ -10,9 +10,9 @@ # @fails if the specified repo file cannot be installed on host def copy_repo(_host, repo_filename, repo_name = 'simp_manual.repo') raise("File #{repo_filename} could not be found") unless File.exist?(repo_filename) - puts('=' * 72) - puts("Using repos defined in #{repo_filename}") - puts('=' * 72) + puts('=' * 72) # rubocop:disable RSpec/Output + puts("Using repos defined in #{repo_filename}") # rubocop:disable RSpec/Output + puts('=' * 72) # rubocop:disable RSpec/Output scp_to(hosts, repo_filename, "/etc/yum.repos.d/#{repo_name}") end @@ -132,7 +132,7 @@ def set_up_local_repo(host, repo_name) hosts.each do |host| os_major = fact_on(host, 'os.release.major') if os_major == '8' - puts 'SKIPPING test because SIMP repositories for EL8 are not set up: SIMP-9143' + puts 'SKIPPING test because SIMP repositories for EL8 are not set up: SIMP-9143' # rubocop:disable RSpec/Output next end diff --git a/spec/acceptance/suites/default/20_openldap_to_389ds_spec.rb b/spec/acceptance/suites/default/20_openldap_to_389ds_spec.rb index 48fc2ec..53518ae 100644 --- a/spec/acceptance/suites/default/20_openldap_to_389ds_spec.rb +++ b/spec/acceptance/suites/default/20_openldap_to_389ds_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper_acceptance' describe 'OpenLDAP to 389DS convert and import scripts' do - ldap_server = only_host_with_role(hosts, 'ldap_server') - ldap_server_fqdn = fact_on(ldap_server, 'networking.fqdn') + let(:ldap_server) { only_host_with_role(hosts, 'ldap_server') } + let(:ldap_server_fqdn) { fact_on(ldap_server, 'networking.fqdn') } let(:files_dir) { File.join(File.dirname(__FILE__), 'files', 'openldap_to_389ds') } let(:scripts_src) { 'share/transition_scripts/openldap_to_389ds' } @@ -126,7 +126,7 @@ end end - context "Executing importer script on #{ldap_server}" do + context 'Executing importer script on ldap_server' do let(:ds_root_name) { 'accounts' } let(:hieradata) do { diff --git a/spec/scripts/bin/unpack_dvd_spec.rb b/spec/scripts/bin/unpack_dvd_spec.rb index f121c4e..a9456be 100644 --- a/spec/scripts/bin/unpack_dvd_spec.rb +++ b/spec/scripts/bin/unpack_dvd_spec.rb @@ -45,7 +45,7 @@ def tmpdir Dir.glob(File.join(__dir__, 'files', 'unpack_dvd', 'ISO', '*')).each do |target| next unless File.directory?(target) - target_name = File.basename(target) + target_name = File.basename(target) # rubocop:disable RSpec/LeakyLocalVariable context "when unpacking an ISO for #{target_name}" do let(:working_dir) { File.join(tmpdir, target_name) }