(CONT-789) Rubocop Manual Fixes 2 - RSpec/NamedSubject

Author: david22swan

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-12 10:15:38 UTC using RuboCop version 1.48.1.
+# on 2023-04-12 10:17:11 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
@@ -141,23 +141,6 @@ RSpec/ExampleLength:
 RSpec/MultipleMemoizedHelpers:
   Max: 8
 
-# 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'
-    - 'spec/classes/mysql_backup_mysqldump_spec.rb'
-    - 'spec/classes/mysql_backup_xtrabackup_spec.rb'
-    - 'spec/classes/mysql_client_spec.rb'
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-    - 'spec/classes/mysql_server_spec.rb'
-    - 'spec/defines/mysql_db_spec.rb'
-    - 'spec/functions/mysql_normalise_and_deepmerge_spec.rb'
-    - 'spec/functions/mysql_strip_hash_spec.rb'
-
 # Offense count: 45
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:

spec/classes/graceful_failures_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe 'mysql::server' do
+  subject(:server) { described_class.new }
+
   context 'on an unsupported OS' do
     let(:facts) do
       {
@@ -12,7 +14,7 @@
     end
 
     it 'gracefully fails' do
-      expect(subject).to compile.and_raise_error(%r{Unsupported platform:})
+      expect(server).to compile.and_raise_error(%r{Unsupported platform:})
     end
   end
 end

spec/classes/mycnf_template_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe 'mysql::server' do
+  subject(:server) { described_class.new }
+
   on_supported_os.each do |os, facts|
     context "my.cnf template - on #{os}" do
       let(:facts) do
@@ -13,16 +15,16 @@
         let(:params) { { override_options: { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0644',
-                                                                    selinux_ignore_defaults: true).with_content(%r{socket = \/var\/lib\/mysql\/mysql.sock})
+          expect(server).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
-          expect(subject).to contain_file('mysql-config-file').with_content(
+          expect(server).to contain_file('mysql-config-file').with_content(
             %r{.*replicate-do-db = base1\nreplicate-do-db = base2.*},
           )
         end
@@ -80,8 +82,8 @@
         let(:params) { { includedir: '/etc/my.cnf.d' } }
 
         it 'makes the directory' do
-          expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
-                                                                mode: '0755')
+          expect(server).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 +93,8 @@
         let(:params) { { includedir: '' } }
 
         it 'shouldnt contain the directory' do
-          expect(subject).not_to contain_file('mysql-config-file').with(ensure: :directory,
-                                                                        mode: '0755')
+          expect(server).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 +104,55 @@
         let(:params) { { 'config_file_mode' => '0644' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0644')
+          expect(server).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
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0664')
+          expect(server).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
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0660')
+          expect(server).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
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0641')
+          expect(server).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
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0610')
+          expect(server).to contain_file('mysql-config-file').with(mode: '0610')
         end
       end
 
       context 'with file 0600' do
         let(:params) { { 'config_file_mode' => '0600' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0600')
+          expect(server).to contain_file('mysql-config-file').with(mode: '0600')
         end
       end
 
       context 'user owner 12345' do
         let(:params) { { 'mycnf_owner' => '12345' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(
+          expect(server).to contain_file('mysql-config-file').with(
             owner: '12345',
           )
         end
@@ -160,7 +162,7 @@
         let(:params) { { 'mycnf_group' => '12345' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(
+          expect(server).to contain_file('mysql-config-file').with(
             group: '12345',
           )
         end
@@ -170,7 +172,7 @@
         let(:params) { { 'mycnf_owner' => '12345', 'mycnf_group' => '12345' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(
+          expect(server).to contain_file('mysql-config-file').with(
             owner: '12345',
             group: '12345',
           )

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe 'mysql::backup::mysqldump' do
+  subject(:backup_mysqldump) { described_class.new }
+
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
@@ -30,7 +32,7 @@ class { 'mysql::server': }
         end
 
         it {
-          expect(subject).to contain_cron('mysql-backup').with(
+          expect(backup_mysqldump).to contain_cron('mysql-backup').with(
             hour: 23,
             minute: 59,
             monthday: 30,
@@ -44,7 +46,7 @@ class { 'mysql::server': }
         let(:params) { default_params }
 
         it {
-          expect(subject).to contain_cron('mysql-backup').with(
+          expect(backup_mysqldump).to contain_cron('mysql-backup').with(
             command: '/usr/local/sbin/mysqlbackup.sh',
             ensure: 'present',
             hour: 23,
@@ -62,13 +64,13 @@ class { 'mysql::server': }
         end
 
         it {
-          expect(subject).to contain_file('mysqlbackup.sh').with_content(
+          expect(backup_mysqldump).to contain_file('mysqlbackup.sh').with_content(
             %r{(\| TEST -TEST)},
           )
-          expect(subject).to contain_file('mysqlbackup.sh').with_content(
+          expect(backup_mysqldump).to contain_file('mysqlbackup.sh').with_content(
             %r{(\.TEST)},
           )
-          expect(subject).not_to contain_package('bzip2')
+          expect(backup_mysqldump).not_to contain_package('bzip2')
         }
       end
 
@@ -81,7 +83,7 @@ class { 'mysql::server': }
         end
 
         it {
-          expect(subject).to contain_file('mysqlbackup.sh').with_content(
+          expect(backup_mysqldump).to contain_file('mysqlbackup.sh').with_content(
             %r{information_schema},
           )
         }