(CONT-789) Rubocop Auto Fixes 11-15

- RSpec/EmptyLineAfterExampleGroup
- RSpec/EmptyLineAfterHook
- RSpec/ExcessiveDocstringSpacing
- RSpec/ImplicitSubject
- Style/AccessorGrouping

Author: david22swan

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-11 15:00:23 UTC using RuboCop version 1.48.1.
+# on 2023-04-12 10:15:38 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -131,40 +131,20 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 21
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterExampleGroup:
-  Exclude:
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterHook:
-  Exclude:
-    - 'spec/unit/facter/mysql_server_id_spec.rb'
-    - 'spec/unit/facter/mysql_version_spec.rb'
-    - 'spec/unit/facter/mysqld_version_spec.rb'
-    - 'spec/unit/puppet/provider/mysql_database/mysql_spec.rb'
-
-# Offense count: 32
+# Offense count: 33
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 32
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ExcessiveDocstringSpacing:
-  Exclude:
-    - 'spec/unit/puppet/provider/mysql_user/mysql_spec.rb'
-    - 'spec/unit/puppet/type/mysql_user_spec.rb'
+# Offense count: 36
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 8
 
-# Offense count: 131
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
-RSpec/ImplicitSubject:
+# Offense count: 121
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
+RSpec/NamedSubject:
   Exclude:
     - 'spec/classes/graceful_failures_spec.rb'
     - 'spec/classes/mycnf_template_spec.rb'
@@ -176,14 +156,8 @@ RSpec/ImplicitSubject:
     - 'spec/classes/mysql_server_spec.rb'
     - 'spec/defines/mysql_db_spec.rb'
     - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb'
-    - 'spec/functions/mysql_password_spec.rb'
     - 'spec/functions/mysql_strip_hash_spec.rb'
 
-# Offense count: 36
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
-  Max: 8
-
 # Offense count: 45
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
@@ -209,14 +183,6 @@ RSpec/StubbedMock:
 RSpec/VerifiedDoubleReference:
   EnforcedStyle: string
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: separated, grouped
-Style/AccessorGrouping:
-  Exclude:
-    - 'lib/puppet/provider/mysql_login_path/inifile.rb'
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: MinBranchesCount.

lib/puppet/provider/mysql_login_path/inifile.rb

@@ -416,8 +416,7 @@ def parse(content)
   # object.
   class Parser
     attr_writer :section
-    attr_accessor :property
-    attr_accessor :value
+    attr_accessor :property, :value
 
     # Create a new IniFile::Parser that can be used to parse the contents of
     # an .ini file.

spec/acceptance/types/mysql_user_spec.rb

@@ -136,6 +136,7 @@ class { 'mysql::server': * => $ed25519_opts }
       end
     end
   end
+
   context 'using resource should throw no errors' do
     describe 'find users' do
       it do
@@ -145,6 +146,7 @@ class { 'mysql::server': * => $ed25519_opts }
       end
     end
   end
+
   context 'using user-w-ssl@localhost with SSL' do
     describe 'adding user' do
       pp_five = <<-MANIFEST
@@ -172,6 +174,7 @@ class { 'mysql::server': * => $ed25519_opts }
       end
     end
   end
+
   context 'using user-w-x509@localhost with X509' do
     describe 'adding user' do
       pp_six = <<-MANIFEST
@@ -199,6 +202,7 @@ class { 'mysql::server': * => $ed25519_opts }
       end
     end
   end
+
   context 'using user-w-subject@localhost with ISSUER and SUBJECT' do
     describe 'adding user' do
       it 'works without errors' do

spec/classes/graceful_failures_spec.rb

@@ -12,7 +12,7 @@
     end
 
     it 'gracefully fails' do
-      is_expected.to compile.and_raise_error(%r{Unsupported platform:})
+      expect(subject).to compile.and_raise_error(%r{Unsupported platform:})
     end
   end
 end

spec/classes/mycnf_template_spec.rb

@@ -13,16 +13,16 @@
         let(:params) { { override_options: { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0644',
-                                                                selinux_ignore_defaults: true).with_content(%r{socket = \/var\/lib\/mysql\/mysql.sock})
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0644',
+                                                                    selinux_ignore_defaults: true).with_content(%r{socket = \/var\/lib\/mysql\/mysql.sock})
         end
       end
 
       describe 'array entry' do
         let(:params) { { override_options: { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2'] } } } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with_content(
+          expect(subject).to contain_file('mysql-config-file').with_content(
             %r{.*replicate-do-db = base1\nreplicate-do-db = base2.*},
           )
         end
@@ -80,8 +80,8 @@
         let(:params) { { includedir: '/etc/my.cnf.d' } }
 
         it 'makes the directory' do
-          is_expected.to contain_file('/etc/my.cnf.d').with(ensure: :directory,
-                                                            mode: '0755')
+          expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
+                                                                mode: '0755')
         end
 
         it { is_expected.to contain_file('mysql-config-file').with_content(%r{!includedir}) }
@@ -91,8 +91,8 @@
         let(:params) { { includedir: '' } }
 
         it 'shouldnt contain the directory' do
-          is_expected.not_to contain_file('mysql-config-file').with(ensure: :directory,
-                                                                    mode: '0755')
+          expect(subject).not_to contain_file('mysql-config-file').with(ensure: :directory,
+                                                                        mode: '0755')
         end
 
         it { is_expected.to contain_file('mysql-config-file').without_content(%r{!includedir}) }
@@ -102,55 +102,55 @@
         let(:params) { { 'config_file_mode' => '0644' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0644')
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0644')
         end
       end
 
       context 'with file mode 0664' do
         let(:params) { { 'config_file_mode' => '0664' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0664')
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0664')
         end
       end
 
       context 'with file mode 0660' do
         let(:params) { { 'config_file_mode' => '0660' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0660')
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0660')
         end
       end
 
       context 'with file mode 0641' do
         let(:params) { { 'config_file_mode' => '0641' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0641')
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0641')
         end
       end
 
       context 'with file mode 0610' do
         let(:params) { { 'config_file_mode' => '0610' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0610')
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0610')
         end
       end
 
       context 'with file 0600' do
         let(:params) { { 'config_file_mode' => '0600' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(mode: '0600')
+          expect(subject).to contain_file('mysql-config-file').with(mode: '0600')
         end
       end
 
       context 'user owner 12345' do
         let(:params) { { 'mycnf_owner' => '12345' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(
+          expect(subject).to contain_file('mysql-config-file').with(
             owner: '12345',
           )
         end
@@ -160,7 +160,7 @@
         let(:params) { { 'mycnf_group' => '12345' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(
+          expect(subject).to contain_file('mysql-config-file').with(
             group: '12345',
           )
         end
@@ -170,7 +170,7 @@
         let(:params) { { 'mycnf_owner' => '12345', 'mycnf_group' => '12345' } }
 
         it do
-          is_expected.to contain_file('mysql-config-file').with(
+          expect(subject).to contain_file('mysql-config-file').with(
             owner: '12345',
             group: '12345',
           )

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -30,7 +30,7 @@ class { 'mysql::server': }
         end
 
         it {
-          is_expected.to contain_cron('mysql-backup').with(
+          expect(subject).to contain_cron('mysql-backup').with(
             hour: 23,
             minute: 59,
             monthday: 30,
@@ -44,7 +44,7 @@ class { 'mysql::server': }
         let(:params) { default_params }
 
         it {
-          is_expected.to contain_cron('mysql-backup').with(
+          expect(subject).to contain_cron('mysql-backup').with(
             command: '/usr/local/sbin/mysqlbackup.sh',
             ensure: 'present',
             hour: 23,
@@ -62,13 +62,13 @@ class { 'mysql::server': }
         end
 
         it {
-          is_expected.to contain_file('mysqlbackup.sh').with_content(
+          expect(subject).to contain_file('mysqlbackup.sh').with_content(
             %r{(\| TEST -TEST)},
           )
-          is_expected.to contain_file('mysqlbackup.sh').with_content(
+          expect(subject).to contain_file('mysqlbackup.sh').with_content(
             %r{(\.TEST)},
           )
-          is_expected.not_to contain_package('bzip2')
+          expect(subject).not_to contain_package('bzip2')
         }
       end
 
@@ -81,7 +81,7 @@ class { 'mysql::server': }
         end
 
         it {
-          is_expected.to contain_file('mysqlbackup.sh').with_content(
+          expect(subject).to contain_file('mysqlbackup.sh').with_content(
             %r{information_schema},
           )
         }