(maint) fix all spec rubocops

puppetlabs · May 4, 2024 · 3aae838 · 3aae838
1 parent 33211ed
commit 3aae838
Show file tree

Hide file tree

Showing 15 changed files with 174 additions and 209 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -19,7 +19,6 @@ AllCops:
   - "**/Puppetfile"
   - "**/Vagrantfile"
   - "**/Guardfile"
-inherit_from: ".rubocop_todo.yml"
 Layout/LineLength:
   Description: People have wide screens, use them.
   Max: 200

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/.sync.yml b/.sync.yml
@@ -1,8 +1,4 @@
 ---
-.rubocop.yml:
-  include_todos: true
-
-
 spec/spec_helper.rb:
   spec_overrides:
   - require 'spec_helper_local'

diff --git a/spec/classes/graceful_failures_spec.rb b/spec/classes/graceful_failures_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it 'gracefully fails' do
-      expect(subject).to compile.and_raise_error(%r{Unsupported platform:})
+      is_expected.to compile.and_raise_error(%r{Unsupported platform:})
     end
   end
 end
diff --git a/spec/classes/mycnf_template_spec.rb b/spec/classes/mycnf_template_spec.rb
@@ -13,7 +13,7 @@
         let(:params) { { override_options: { 'mysqld' => { 'socket' => '/var/lib/mysql/mysql.sock' } } } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0644',
+          is_expected.to contain_file('mysql-config-file').with(mode: '0644',
                                                                     selinux_ignore_defaults: true).with_content(%r{socket = /var/lib/mysql/mysql.sock})
         end
       end
@@ -22,7 +22,7 @@
         let(:params) { { override_options: { 'mysqld' => { 'replicate-do-db' => ['base1', 'base2'] } } } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with_content(
+          is_expected.to contain_file('mysql-config-file').with_content(
             %r{.*replicate-do-db = base1\nreplicate-do-db = base2.*},
           )
         end
@@ -80,7 +80,7 @@
         let(:params) { { includedir: '/etc/my.cnf.d' } }
 
         it 'makes the directory' do
-          expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
+          is_expected.to contain_file('/etc/my.cnf.d').with(ensure: :directory,
                                                                 mode: '0755')
         end
 
@@ -91,7 +91,7 @@
         let(:params) { { includedir: '' } }
 
         it 'shouldnt contain the directory' do
-          expect(subject).not_to contain_file('mysql-config-file').with(ensure: :directory,
+          is_expected.not_to contain_file('mysql-config-file').with(ensure: :directory,
                                                                         mode: '0755')
         end
 
@@ -102,55 +102,55 @@
         let(:params) { { 'config_file_mode' => '0644' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(mode: '0644')
+          is_expected.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')
+          is_expected.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')
+          is_expected.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')
+          is_expected.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')
+          is_expected.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')
+          is_expected.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(
+          is_expected.to contain_file('mysql-config-file').with(
             owner: '12345',
           )
         end
@@ -160,7 +160,7 @@
         let(:params) { { 'mycnf_group' => '12345' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(
+          is_expected.to contain_file('mysql-config-file').with(
             group: '12345',
           )
         end
@@ -170,7 +170,7 @@
         let(:params) { { 'mycnf_owner' => '12345', 'mycnf_group' => '12345' } }
 
         it do
-          expect(subject).to contain_file('mysql-config-file').with(
+          is_expected.to contain_file('mysql-config-file').with(
             owner: '12345',
             group: '12345',
           )

diff --git a/spec/classes/mysql_backup_mysqldump_spec.rb b/spec/classes/mysql_backup_mysqldump_spec.rb
@@ -30,7 +30,7 @@ class { 'mysql::server': }
         end
 
         it {
-          expect(subject).to contain_cron('mysql-backup').with(
+          is_expected.to contain_cron('mysql-backup').with(
             hour: 23,
             minute: 59,
             monthday: 30,
@@ -46,7 +46,7 @@ class { 'mysql::server': }
         it { is_expected.to contain_class('mysql::params') }
 
         it {
-          expect(subject).to contain_cron('mysql-backup').with(
+          is_expected.to contain_cron('mysql-backup').with(
             command: '/usr/local/sbin/mysqlbackup.sh',
             ensure: 'present',
             hour: 23,
@@ -64,13 +64,13 @@ class { 'mysql::server': }
         end
 
         it {
-          expect(subject).to contain_file('mysqlbackup.sh').with_content(
+          is_expected.to contain_file('mysqlbackup.sh').with_content(
             %r{(\| TEST -TEST)},
           )
-          expect(subject).to contain_file('mysqlbackup.sh').with_content(
+          is_expected.to contain_file('mysqlbackup.sh').with_content(
             %r{(\.TEST)},
           )
-          expect(subject).not_to contain_package('bzip2')
+          is_expected.not_to contain_package('bzip2')
         }
       end
 
@@ -83,7 +83,7 @@ class { 'mysql::server': }
         end
 
         it {
-          expect(subject).to contain_file('mysqlbackup.sh').with_content(
+          is_expected.to contain_file('mysqlbackup.sh').with_content(
             %r{information_schema},
           )
         }

diff --git a/spec/classes/mysql_backup_xtrabackup_spec.rb b/spec/classes/mysql_backup_xtrabackup_spec.rb
@@ -28,13 +28,13 @@ class { 'mysql::server': }
         it { is_expected.to contain_class('mysql::params') }
 
         it 'does not contain the touch command' do
-          expect(subject).to contain_file('xtrabackup.sh').without_content(
+          is_expected.to contain_file('xtrabackup.sh').without_content(
             %r{(^\s+touch\s+$)},
           )
         end
 
         it 'contains the wrapper script' do
-          expect(subject).to contain_file('xtrabackup.sh').with_content(
+          is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{(\n*^xtrabackup\s+.*\$@)},
           )
         end
@@ -61,7 +61,7 @@ class { 'mysql::server': }
                   end
 
         it 'contains the weekly cronjob' do
-          expect(subject).to contain_cron('xtrabackup-weekly')
+          is_expected.to contain_cron('xtrabackup-weekly')
             .with(
               ensure: 'present',
               command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/$(date +\%F)_full --backup',
@@ -80,7 +80,7 @@ class { 'mysql::server': }
                        else
                          '$(date -d "last sunday" +\%F)_full'
                        end
-          expect(subject).to contain_cron('xtrabackup-daily')
+          is_expected.to contain_cron('xtrabackup-daily')
             .with(
               ensure: 'present',
               command: "/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp/#{dateformat} --target-dir=/tmp/$(date +\\%F_\\%H-\\%M-\\%S) --backup",
@@ -100,14 +100,14 @@ class { 'mysql::server': }
         end
 
         it 'contains the defined mysql user' do
-          expect(subject).to contain_mysql_user('backupuser@localhost')
+          is_expected.to contain_mysql_user('backupuser@localhost')
             .with(
               ensure: 'present',
               password_hash: '*4110E08DF51E70A4BA1D4E33A84205E38CF3FE58',
             )
             .that_requires('Class[mysql::server::root_password]')
 
-          expect(subject).to contain_mysql_grant('backupuser@localhost/*.*')
+          is_expected.to contain_mysql_grant('backupuser@localhost/*.*')
             .with(
               ensure: 'present',
               user: 'backupuser@localhost',
@@ -129,9 +129,9 @@ class { 'mysql::server': }
           end
 
           it {
-            expect(subject).not_to contain_mysql_grant('backupuser@localhost/performance_schema.keyring_component_status')
-            expect(subject).not_to contain_mysql_grant('backupuser@localhost/performance_schema.log_status')
-            expect(subject).not_to contain_mysql_grant('backupuser@localhost/*.*')
+            is_expected.not_to contain_mysql_grant('backupuser@localhost/performance_schema.keyring_component_status')
+            is_expected.not_to contain_mysql_grant('backupuser@localhost/performance_schema.log_status')
+            is_expected.not_to contain_mysql_grant('backupuser@localhost/*.*')
               .with(
                 ensure: 'present',
                 user: 'backupuser@localhost',
@@ -150,7 +150,7 @@ class { 'mysql::server': }
           end
 
           it {
-            expect(subject).to contain_mysql_grant('backupuser@localhost/*.*')
+            is_expected.to contain_mysql_grant('backupuser@localhost/*.*')
               .with(
                 ensure: 'present',
                 user: 'backupuser@localhost',
@@ -164,7 +164,7 @@ class { 'mysql::server': }
                 end,
               )
               .that_requires('Mysql_user[backupuser@localhost]')
-            expect(subject).to contain_mysql_grant('backupuser@localhost/performance_schema.keyring_component_status')
+            is_expected.to contain_mysql_grant('backupuser@localhost/performance_schema.keyring_component_status')
               .with(
                 ensure: 'present',
                 user: 'backupuser@localhost',
@@ -174,7 +174,7 @@ class { 'mysql::server': }
               )
               .that_requires('Mysql_user[backupuser@localhost]')
 
-            expect(subject).to contain_mysql_grant('backupuser@localhost/performance_schema.log_status')
+            is_expected.to contain_mysql_grant('backupuser@localhost/performance_schema.log_status')
               .with(
                 ensure: 'present',
                 user: 'backupuser@localhost',
@@ -221,7 +221,7 @@ class { 'mysql::server': }
                      end
 
         it 'contains the weekly cronjob' do
-          expect(subject).to contain_cron('xtrabackup-weekly')
+          is_expected.to contain_cron('xtrabackup-weekly')
             .with(
               ensure: 'present',
               command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/$(date +\%F)_full --backup --skip-ssl',
@@ -234,7 +234,7 @@ class { 'mysql::server': }
         end
 
         it 'contains the daily cronjob for weekdays 1-6' do
-          expect(subject).to contain_cron('xtrabackup-daily')
+          is_expected.to contain_cron('xtrabackup-daily')
             .with(
               ensure: 'present',
               command: "/usr/local/sbin/xtrabackup.sh --incremental-basedir=/tmp/#{dateformat} --target-dir=/tmp/$(date +\\%F_\\%H-\\%M-\\%S) --backup --skip-ssl",
@@ -253,11 +253,11 @@ class { 'mysql::server': }
         end
 
         it 'not contains the weekly cronjob' do
-          expect(subject).not_to contain_cron('xtrabackup-weekly')
+          is_expected.not_to contain_cron('xtrabackup-weekly')
         end
 
         it 'contains the daily cronjob with all weekdays' do
-          expect(subject).to contain_cron('xtrabackup-daily').with(
+          is_expected.to contain_cron('xtrabackup-daily').with(
             ensure: 'present',
             command: '/usr/local/sbin/xtrabackup.sh --target-dir=/tmp/$(date +\%F_\%H-\%M-\%S) --backup',
             user: 'root',
@@ -275,7 +275,7 @@ class { 'mysql::server': }
         end
 
         it 'contains the prescript' do
-          expect(subject).to contain_file('xtrabackup.sh').with_content(
+          is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{.*rsync -a /tmp backup01.local-lan:\n\nrsync -a /tmp backup02.local-lan:.*},
           )
         end
@@ -288,7 +288,7 @@ class { 'mysql::server': }
         end
 
         it 'contains the prostscript' do
-          expect(subject).to contain_file('xtrabackup.sh').with_content(
+          is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{.*rsync -a /tmp backup01.local-lan:\n\nrsync -a /tmp backup02.local-lan:.*},
           )
         end
@@ -301,7 +301,7 @@ class { 'mysql::server': }
         end
 
         it 'contain the mariabackup executor' do
-          expect(subject).to contain_file('xtrabackup.sh').with_content(
+          is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{(\n*^mariabackup\s+.*\$@)},
           )
         end
@@ -313,7 +313,7 @@ class { 'mysql::server': }
         end
 
         it 'contain the touch /tmp/backup_success command' do
-          expect(subject).to contain_file('xtrabackup.sh').with_content(
+          is_expected.to contain_file('xtrabackup.sh').with_content(
             %r{(^\s+touch /tmp/backup_success$)},
           )
         end

diff --git a/spec/classes/mysql_client_spec.rb b/spec/classes/mysql_client_spec.rb
@@ -44,7 +44,7 @@
         end
 
         it do
-          expect(subject).to contain_package('mysql_client').with(
+          is_expected.to contain_package('mysql_client').with(
             provider: 'dpkg',
             source: '/somewhere',
           )