(CONT-792) - Correct RSpec/ImplicitSubject

Author: jordanbreen28

.rubocop_todo.yml

@@ -96,11 +96,8 @@ RSpec/FilePath:
     - 'spec/defines/server/instance/service.rb'
     - 'spec/unit/puppet/type/postgresql_conn_validator.rb'
 
-# Offense count: 183
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
-RSpec/ImplicitSubject:
+
+RSpec/NamedSubject:
   Enabled: false
 
 # Offense count: 2

spec/classes/client_spec.rb

@@ -16,22 +16,22 @@
     end
 
     it 'modifies package' do
-      is_expected.to contain_package('postgresql-client').with(ensure: 'absent',
-                                                               name: 'mypackage',
-                                                               tag: 'puppetlabs-postgresql')
+      expect(subject).to contain_package('postgresql-client').with(ensure: 'absent',
+                                                                   name: 'mypackage',
+                                                                   tag: 'puppetlabs-postgresql')
     end
 
     it 'has specified validate connexion' do
-      is_expected.to contain_file('/opt/bin/my-validate-con.sh').with(ensure: 'file',
-                                                                      owner: 0,
-                                                                      group: 0,
-                                                                      mode: '0755')
+      expect(subject).to contain_file('/opt/bin/my-validate-con.sh').with(ensure: 'file',
+                                                                          owner: 0,
+                                                                          group: 0,
+                                                                          mode: '0755')
     end
   end
 
   describe 'with no parameters' do
     it 'creates package with postgresql tag' do
-      is_expected.to contain_package('postgresql-client').with(tag: 'puppetlabs-postgresql')
+      expect(subject).to contain_package('postgresql-client').with(tag: 'puppetlabs-postgresql')
     end
   end
 
@@ -55,7 +55,7 @@ class { 'postgresql::globals':
     end
 
     it 'does not manage postgresql-client package' do
-      is_expected.not_to contain_package('postgresql-client')
+      expect(subject).not_to contain_package('postgresql-client')
     end
   end
 end

spec/classes/globals_spec.rb

@@ -8,7 +8,7 @@
 
     describe 'with no parameters' do
       it 'executes successfully' do
-        is_expected.to contain_class('postgresql::globals')
+        expect(subject).to contain_class('postgresql::globals')
       end
     end
 
@@ -20,7 +20,7 @@
       end
 
       it 'pulls in class postgresql::repo' do
-        is_expected.to contain_class('postgresql::repo')
+        expect(subject).to contain_class('postgresql::repo')
       end
     end
   end
@@ -30,7 +30,7 @@
 
     describe 'with no parameters' do
       it 'executes successfully' do
-        is_expected.to contain_class('postgresql::globals')
+        expect(subject).to contain_class('postgresql::globals')
       end
     end
 
@@ -43,15 +43,15 @@
       end
 
       it 'pulls in class postgresql::repo' do
-        is_expected.to contain_class('postgresql::repo')
+        expect(subject).to contain_class('postgresql::repo')
       end
 
       it do
-        is_expected.to contain_yumrepo('yum.postgresql.org').with(
+        expect(subject).to contain_yumrepo('yum.postgresql.org').with(
           'enabled' => '1',
           'proxy' => 'http://proxy-server:8080',
         )
-        is_expected.to contain_yumrepo('pgdg-common').with(
+        expect(subject).to contain_yumrepo('pgdg-common').with(
           'enabled' => '1',
           'proxy' => 'http://proxy-server:8080',
         )
@@ -68,15 +68,15 @@
       end
 
       it 'pulls in class postgresql::repo' do
-        is_expected.to contain_class('postgresql::repo')
+        expect(subject).to contain_class('postgresql::repo')
       end
 
       it do
-        is_expected.to contain_yumrepo('yum.postgresql.org').with(
+        expect(subject).to contain_yumrepo('yum.postgresql.org').with(
           'enabled' => '1',
           'baseurl' => 'http://mirror.localrepo.com/pgdg-postgresql',
         )
-        is_expected.to contain_yumrepo('pgdg-common').with(
+        expect(subject).to contain_yumrepo('pgdg-common').with(
           'enabled' => '1',
           'baseurl' => 'http://mirror.localrepo.com/pgdg-common',
         )

spec/classes/lib/devel_spec.rb

@@ -9,7 +9,7 @@
 
   describe 'link pg_config to /usr/bin' do
     it {
-      is_expected.not_to contain_file('/usr/bin/pg_config') \
+      expect(subject).not_to contain_file('/usr/bin/pg_config') \
         .with_ensure('link') \
         .with_target('/usr/lib/postgresql/13/bin/pg_config')
     }
@@ -38,7 +38,7 @@
     end
 
     it {
-      is_expected.to contain_file('/usr/bin/pg_config') \
+      expect(subject).to contain_file('/usr/bin/pg_config') \
         .with_ensure('link') \
         .with_target('/usr/pgsql-9.3/bin/pg_config')
     }
@@ -53,7 +53,7 @@
     end
 
     it 'fails to compile' do
-      is_expected.to compile.and_raise_error(%r{is not supported})
+      expect(subject).to compile.and_raise_error(%r{is not supported})
     end
   end
 end

spec/classes/lib/java_spec.rb

@@ -7,7 +7,7 @@
     include_examples 'Debian 11'
 
     it {
-      is_expected.to contain_package('postgresql-jdbc').with(
+      expect(subject).to contain_package('postgresql-jdbc').with(
         name: 'libpostgresql-jdbc-java',
         ensure: 'present',
         tag: 'puppetlabs-postgresql',
@@ -19,7 +19,7 @@
     include_examples 'RedHat 8'
 
     it {
-      is_expected.to contain_package('postgresql-jdbc').with(
+      expect(subject).to contain_package('postgresql-jdbc').with(
         name: 'postgresql-jdbc',
         ensure: 'present',
         tag: 'puppetlabs-postgresql',
@@ -32,7 +32,7 @@
       end
 
       it {
-        is_expected.to contain_package('postgresql-jdbc').with(
+        expect(subject).to contain_package('postgresql-jdbc').with(
           name: 'somepackage',
           ensure: 'latest',
           tag: 'puppetlabs-postgresql',

spec/classes/lib/perl_spec.rb

@@ -7,7 +7,7 @@
     include_examples 'RedHat 8'
 
     it {
-      is_expected.to contain_package('perl-DBD-Pg').with(
+      expect(subject).to contain_package('perl-DBD-Pg').with(
         name: 'perl-DBD-Pg',
         ensure: 'present',
       )
@@ -18,7 +18,7 @@
     include_examples 'Debian 11'
 
     it {
-      is_expected.to contain_package('perl-DBD-Pg').with(
+      expect(subject).to contain_package('perl-DBD-Pg').with(
         name: 'libdbd-pg-perl',
         ensure: 'present',
       )

spec/classes/lib/pgdocs_spec.rb

@@ -7,7 +7,7 @@
     include_examples 'RedHat 8'
 
     it {
-      is_expected.to contain_package('postgresql-docs').with(
+      expect(subject).to contain_package('postgresql-docs').with(
         name: 'postgresql-docs',
         ensure: 'present',
         tag: 'puppetlabs-postgresql',
@@ -20,7 +20,7 @@
       end
 
       it {
-        is_expected.to contain_package('postgresql-docs').with(
+        expect(subject).to contain_package('postgresql-docs').with(
           name: 'somepackage',
           ensure: 'latest',
           tag: 'puppetlabs-postgresql',

spec/classes/lib/python_spec.rb

@@ -7,7 +7,7 @@
     include_examples 'RedHat 7'
 
     it {
-      is_expected.to contain_package('python-psycopg2').with(
+      expect(subject).to contain_package('python-psycopg2').with(
         name: 'python-psycopg2',
         ensure: 'present',
       )
@@ -18,7 +18,7 @@
     include_examples 'RedHat 8'
 
     it {
-      is_expected.to contain_package('python-psycopg2').with(
+      expect(subject).to contain_package('python-psycopg2').with(
         name: 'python3-psycopg2',
         ensure: 'present',
       )
@@ -29,7 +29,7 @@
     include_examples 'Debian 11'
 
     it {
-      is_expected.to contain_package('python-psycopg2').with(
+      expect(subject).to contain_package('python-psycopg2').with(
         name: 'python-psycopg2',
         ensure: 'present',
       )

spec/classes/repo_spec.rb

@@ -7,7 +7,7 @@
 
   describe 'with no parameters' do
     it 'instantiates apt_postgresql_org class' do
-      is_expected.to contain_class('postgresql::repo::apt_postgresql_org')
+      expect(subject).to contain_class('postgresql::repo::apt_postgresql_org')
     end
   end
 end