Apply remaining rubocop fixes

diff --git a/.rubocop.yml b/.rubocop.yml
index 33c33fa52a19154bcf7aa4e403a1f4cc0a1f7328..18238372e4bac4907c73f1a864e9147d6c12788f 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -89,6 +89,8 @@ Performance/CaseWhenSplat:
 Performance/Casecmp:
   Enabled: true
 Performance/CollectionLiteralInLoop:
+  Exclude:
+  - spec/**/*
   Enabled: true
 Performance/CompareWithBlock:
   Enabled: true
@@ -308,6 +310,8 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Migration/DepartmentName:
   Enabled: false
+Naming/AccessorMethodName:
+  Enabled: false
 Naming/BlockParameterName:
   Enabled: false
 Naming/HeredocDelimiterCase:

diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
index 340918d9e4fa98235b4201506aece98e1480ec04..708732d66c1ba880186b871b1d147796492de52a 100644 (file)
--- a/spec/acceptance/apt_key_provider_spec.rb
+++ b/spec/acceptance/apt_key_provider_spec.rb
@@ -442,7 +442,7 @@ hkp_pool_pp = <<-MANIFEST
         }
   MANIFEST
 
-hkps_protocol_supported = os[:family] =~ %r{Ubuntu} && \
+hkps_protocol_supported = os[:family] =~ %r{Ubuntu}i && \
                           os[:family][:release][:full] =~ %r{^18\.04}
 
 if hkps_protocol_supported