(CONT-773) Rubocop Auto Fixes 6-10

- Lint/SymbolConversion
- RSpec/BeNil
- RSpec/EmptyLineAfterExample
- RSpec/EmptyLineAfterExampleGroup
- RSpec/EmptyLineAfterHook

Author: david22swan

.rubocop_todo.yml

@@ -21,14 +21,6 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/defines/source_compat_spec.rb'
     - 'spec/defines/source_spec.rb'
 
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, consistent
-Lint/SymbolConversion:
-  Exclude:
-    - 'spec/classes/apt_update_spec.rb'
-
 # Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -68,21 +60,6 @@ RSpec/BeEq:
     - 'spec/unit/facter/apt_reboot_required_spec.rb'
     - 'spec/unit/puppet/type/apt_key_spec.rb'
 
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be, be_nil
-RSpec/BeNil:
-  Exclude:
-    - 'spec/unit/facter/apt_dist_package_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_package_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_updates_spec.rb'
-    - 'spec/unit/facter/apt_package_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_package_updates_spec.rb'
-    - 'spec/unit/facter/apt_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_updates_spec.rb'
-
 # Offense count: 6
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
@@ -97,52 +74,6 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 23
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/acceptance/apt_key_provider_spec.rb'
-    - 'spec/acceptance/apt_spec.rb'
-    - 'spec/classes/apt_spec.rb'
-    - 'spec/defines/key_compat_spec.rb'
-    - 'spec/defines/key_spec.rb'
-    - 'spec/defines/pin_spec.rb'
-    - 'spec/defines/ppa_spec.rb'
-    - 'spec/defines/source_spec.rb'
-
-# Offense count: 39
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterExampleGroup:
-  Exclude:
-    - 'spec/acceptance/apt_key_provider_spec.rb'
-    - 'spec/acceptance/init_task_spec.rb'
-    - 'spec/classes/apt_backports_spec.rb'
-    - 'spec/classes/apt_spec.rb'
-    - 'spec/classes/apt_update_spec.rb'
-    - 'spec/defines/key_compat_spec.rb'
-    - 'spec/defines/key_spec.rb'
-    - 'spec/defines/source_spec.rb'
-
-# Offense count: 24
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterHook:
-  Exclude:
-    - 'spec/acceptance/apt_key_provider_spec.rb'
-    - 'spec/unit/facter/apt_dist_has_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_package_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_package_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_dist_updates_spec.rb'
-    - 'spec/unit/facter/apt_has_updates_spec.rb'
-    - 'spec/unit/facter/apt_package_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_package_updates_spec.rb'
-    - 'spec/unit/facter/apt_reboot_required_spec.rb'
-    - 'spec/unit/facter/apt_security_updates_spec.rb'
-    - 'spec/unit/facter/apt_updates_spec.rb'
-    - 'spec/unit/puppet/provider/apt_key_spec.rb'
-
 # Offense count: 13
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:

spec/acceptance/apt_key_provider_spec.rb

@@ -669,6 +669,7 @@ def apply_manifest_twice(manifest_pp)
     it 'add an apt_key resource' do
       apply_manifest_twice(ensure_present_pp)
     end
+
     it 'remove the apt_key resource' do
       apply_manifest_twice(ensure_absent_pp)
     end
@@ -855,6 +856,7 @@ def apply_manifest_twice(manifest_pp)
       after(:each) do
         run_shell('rm /tmp/fake-key.gpg')
       end
+
       it 'fails' do
         apply_manifest(path_bogus_content_pp, expect_failures: true) do |r|
           expect(r.stderr).to match(%r{no valid OpenPGP data found})
@@ -897,13 +899,15 @@ def apply_manifest_twice(manifest_pp)
       apply_manifest(refresh_del_key_pp)
       apply_manifest(refresh_pp, catch_failures: true)
     end
+
     context 'when refresh => true' do
       it 'updates an expired key' do
         apply_manifest(refresh_true_pp)
         # Check key has been updated to new version
         run_shell(PUPPETLABS_EXP_CHECK_COMMAND.to_s)
       end
     end
+
     context 'when refresh => false' do
       it 'does not replace an expired key' do
         apply_manifest(refresh_false_pp)

spec/acceptance/apt_spec.rb

@@ -45,6 +45,7 @@ class { 'apt':
         apply_manifest(everything_everything_pp, catch_failures: true)
       end
     end
+
     it 'stills work' do
       run_shell('apt-get update')
       run_shell('apt-get -y --force-yes upgrade')

spec/acceptance/init_task_spec.rb

@@ -10,18 +10,21 @@
       expect(result.stdout).to contain(%r{Reading package lists})
     end
   end
+
   describe 'upgrade' do
     it 'upgrades packages' do
       result = run_bolt_task('apt', 'action' => 'upgrade')
       expect(result.stdout).to contain(%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded})
     end
   end
+
   describe 'dist-upgrade' do
     it 'dist-upgrades packages' do
       result = run_bolt_task('apt', 'action' => 'dist-upgrade')
       expect(result.stdout).to contain(%r{\d+ upgraded, \d+ newly installed, \d+ to remove and \d+ not upgraded})
     end
   end
+
   describe 'autoremove' do
     it 'autoremoves obsolete packages' do
       result = run_bolt_task('apt', 'action' => 'autoremove')

spec/classes/apt_backports_spec.rb

@@ -31,6 +31,7 @@
                                                              pin: { 'priority' => 200, 'release' => 'stretch-backports' })
       }
     end
+
     context 'with defaults on ubuntu' do
       let(:facts) do
         {
@@ -57,6 +58,7 @@
                                                              pin: { 'priority' => 200, 'release' => 'bionac-backports' })
       }
     end
+
     context 'with everything set' do
       let(:facts) do
         {
@@ -92,6 +94,7 @@
                                                              pin: { 'priority' => 90, 'release' => 'vivid' })
       }
     end
+
     context 'when set things with hashes' do
       let(:facts) do
         {
@@ -126,6 +129,7 @@
       }
     end
   end
+
   describe 'mint tests' do
     let(:facts) do
       {
@@ -162,6 +166,7 @@
                                                              pin: { 'priority' => 200, 'release' => 'trusty-backports' })
       }
     end
+
     context 'with missing location' do
       let(:params) do
         {
@@ -175,6 +180,7 @@
         is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
+
     context 'with missing release' do
       let(:params) do
         {
@@ -188,6 +194,7 @@
         is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
+
     context 'with missing repos' do
       let(:params) do
         {
@@ -201,6 +208,7 @@
         is_expected.to raise_error(Puppet::Error, %r{If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key})
       end
     end
+
     context 'with missing key' do
       let(:params) do
         {
@@ -215,6 +223,7 @@
       end
     end
   end
+
   describe 'validation' do
     let(:facts) do
       {
@@ -244,6 +253,7 @@
         is_expected.to raise_error(Puppet::Error, %r{expects a})
       end
     end
+
     context 'with invalid release' do
       let(:params) do
         {
@@ -255,6 +265,7 @@
         is_expected.to raise_error(Puppet::Error, %r{expects a})
       end
     end
+
     context 'with invalid repos' do
       let(:params) do
         {
@@ -266,6 +277,7 @@
         is_expected.to raise_error(Puppet::Error, %r{expects a})
       end
     end
+
     context 'with invalid key' do
       let(:params) do
         {
@@ -277,6 +289,7 @@
         is_expected.to raise_error(Puppet::Error, %r{expects a})
       end
     end
+
     context 'with invalid pin' do
       let(:params) do
         {

spec/classes/apt_spec.rb

@@ -214,6 +214,7 @@
           %r{Acquire::https::proxy "https://localhost:8080/";},
         )
       }
+
       it {
         is_expected.to contain_apt__setting('conf-proxy').with(priority: '01').with_content(
           %r{Acquire::http::proxy "http://localhost:8080/";},
@@ -232,6 +233,7 @@
       }
     end
   end
+
   context 'with lots of non-defaults' do
     let :params do
       {

spec/classes/apt_update_spec.rb

@@ -24,7 +24,7 @@
                 id: 'Debian',
               },
             },
-            'apt_update_last_success': factval,
+            apt_update_last_success: factval,
           }
         end
         let(:pre_condition) do
@@ -61,6 +61,7 @@
         is_expected.to contain_exec('apt_update').with('refreshonly' => false)
       end
     end
+
     context 'and Exec[apt_update] refreshonly is overridden to true and has recent run' do
       let(:facts) do
         {
@@ -76,7 +77,7 @@
               id: 'Debian',
             },
           },
-          'apt_update_last_success': Time.now.to_i,
+          apt_update_last_success: Time.now.to_i,
         }
       end
       let(:pre_condition) do
@@ -92,6 +93,7 @@
       end
     end
   end
+
   context "when apt::update['frequency']='reluctantly'" do
     {
       'a recent run' => Time.now.to_i,
@@ -113,7 +115,7 @@
                 id: 'Debian',
               },
             },
-            'apt_update_last_success': factval,
+            apt_update_last_success: factval,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -149,6 +151,7 @@
       end
     end
   end
+
   ['daily', 'weekly'].each do |update_frequency|
     context "when apt::update['frequency'] has the value of #{update_frequency}" do
       { 'we are due for a run' => 1_406_660_561, 'the update-success-stamp file does not exist' => -1 }.each_pair do |desc, factval|
@@ -167,7 +170,7 @@
                   id: 'Debian',
                 },
               },
-              'apt_update_last_success': factval,
+              apt_update_last_success: factval,
             }
           end
           let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -193,7 +196,7 @@
                 id: 'Debian',
               },
             },
-            'apt_update_last_success': Time.now.to_i,
+            apt_update_last_success: Time.now.to_i,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -203,6 +206,7 @@
           is_expected.to contain_exec('apt_update').with('refreshonly' => true)
         end
       end
+
       context 'when $apt_update_last_success is nil' do
         let(:facts) do
           {
@@ -218,7 +222,7 @@
                 id: 'Debian',
               },
             },
-            'apt_update_last_success': nil,
+            apt_update_last_success: nil,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }