Addressing Rubocop errors

Author: pmcmaw

spec/acceptance/db_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'postgresql::server::db', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  # rubocop:disable RSpec/ExampleLength
-  # rubocop:disable RSpec/MultipleExpectations
   # rubocop:disable Metrics/LineLength
   it 'creates a database' do
     begin

spec/acceptance/postgresql_conn_validator_spec.rb

@@ -22,7 +22,7 @@ class { 'postgresql::server':
   end
 
   context 'local connection' do
-    it 'validates successfully with defaults' do # rubocop:disable RSpec/ExampleLength
+    it 'validates successfully with defaults' do
       pp = <<-MANIFEST
         #{install_pp}->
         postgresql_conn_validator { 'validate this':
@@ -38,7 +38,7 @@ class { 'postgresql::server':
       apply_manifest(pp, catch_changes: true)
     end
 
-    it 'works with connect settings hash' do # rubocop:disable RSpec/ExampleLength
+    it 'works with connect settings hash' do
       pp = <<-MANIFEST
         #{install_pp}->
         postgresql_conn_validator { 'validate this':
@@ -57,7 +57,7 @@ class { 'postgresql::server':
       apply_manifest(pp, catch_changes: true)
     end
 
-    it 'fails gracefully' do # rubocop:disable RSpec/ExampleLength
+    it 'fails gracefully' do
       pp = <<-MANIFEST
         #{install_pp}->
         postgresql_conn_validator { 'validate this':

spec/acceptance/postgresql_psql_spec.rb

@@ -135,7 +135,7 @@ class { 'postgresql::server': } ->
   end
 
   context 'with secure password passing by environment' do
-    it 'runs SQL that contanins password passed by environment' do # rubocop:disable RSpec/ExampleLength
+    it 'runs SQL that contanins password passed by environment' do
       select = "select \\'$PASS_TO_EMBED\\'"
       pp = <<-MANIFEST.unindent
         class { 'postgresql::server': } ->
@@ -151,7 +151,7 @@ class { 'postgresql::server': } ->
       apply_manifest(pp, catch_failures: true)
       apply_manifest(pp, expect_changes: false)
     end
-    it 'runs SQL that contanins password passed by environment in check' do # rubocop:disable RSpec/ExampleLength
+    it 'runs SQL that contanins password passed by environment in check' do
       select = "select 1 where \\'$PASS_TO_EMBED\\'=\\'passwD\\'"
       pp = <<-MANIFEST.unindent
         class { 'postgresql::server': } ->

spec/acceptance/server/grant_role_spec.rb

@@ -210,8 +210,6 @@ class { 'postgresql::server': }
     MANIFEST
   end
 
-  # rubocop:disable RSpec/ExampleLength
-  # rubocop:disable RSpec/MultipleExpectations
   it 'grants a role to a user' do
     begin
       apply_manifest(pp_one, catch_failures: true)

spec/acceptance/server/grant_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'postgresql::server::grant:', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  # rubocop:disable RSpec/ExampleLength
-  # rubocop:disable RSpec/MultipleExpectations
   let(:db) { 'grant_priv_test' }
   let(:owner) { 'psql_grant_priv_owner' }
   let(:user) { 'psql_grant_priv_tester' }

spec/acceptance/server/reassign_owned_by_spec.rb

@@ -102,8 +102,6 @@ class { 'postgresql::server': }
         MANIFEST
       end
 
-      # rubocop:disable RSpec/ExampleLength
-      # rubocop:disable RSpec/MultipleExpectations
       it 'reassigns all objects to new_owner' do
         begin
           # postgres version

spec/acceptance/server/schema_spec.rb

@@ -53,8 +53,6 @@ class { 'postgresql::server': }
     MANIFEST
   end
 
-  # rubocop:disable RSpec/ExampleLength
-  # rubocop:disable RSpec/MultipleExpectations
   it 'creates a schema for a user' do
     begin
       apply_manifest(pp, catch_failures: true)

spec/unit/classes/lib/devel_spec.rb

@@ -75,7 +75,7 @@
       }
     end
 
-    it 'fails to compile' do # rubocop:disable RSpec/MultipleExpectations
+    it 'fails to compile' do
       expect {
         is_expected.to compile
       }.to raise_error(%r{is not supported})

spec/unit/classes/server/contrib_spec.rb

@@ -46,7 +46,7 @@
       }
     end
 
-    it 'fails to compile' do # rubocop:disable RSpec/MultipleExpectations
+    it 'fails to compile' do
       expect {
         is_expected.to compile
       }.to raise_error(%r{is not supported})

spec/unit/puppet/provider/postgresql_conn_validator/ruby_spec.rb

@@ -57,7 +57,7 @@
     end
 
     it 'tries the correct number of times' do
-      expect(provider.validator).to receive(:execute_command).exactly(3).times # rubocop:disable RSpec/MessageSpies
+      expect(provider.validator).to receive(:execute_command).exactly(3).times
 
       provider.validator.attempt_connection(sleep_length, tries)
     end

spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Puppet::Type.type(:postgresql_psql).provider(:ruby) do
-  # rubocop:disable RSpec/MessageSpies
   let(:name) { 'rspec psql test' }
   let(:resource) do
     Puppet::Type.type(:postgresql_psql).new({ name: name, provider: :ruby }.merge(attributes))
@@ -31,7 +30,7 @@
         }
       end
 
-      it 'executes with the given psql_path on the given DB' do # rubocop:disable RSpec/MultipleExpectations
+      it 'executes with the given psql_path on the given DB' do
         expect(Dir).to receive(:chdir).with(attributes[:cwd]).and_yield
         expect(provider).to receive(:run_command).with([attributes[:psql_path],
                                                         '-d', attributes[:db], '-t', '-c', '"SELECT \'something\' as \"Custom column\""'],
@@ -105,5 +104,4 @@
       provider.run_unless_sql_command('SELECT 1')
     end
   end
-  # rubocop:enable RSpec/MessageSpies
 end

spec/unit/puppet/type/postgresql_psql_spec.rb

@@ -74,8 +74,6 @@
     end
   end
 
-  # rubocop:disable RSpec/MultipleExpectations
-  # rubocop:disable RSpec/MessageSpies
   # rubocop:disable RSpec/NamedSubject
   # rubocop:disable RSpec/SubjectStub
   describe '#command' do
@@ -124,7 +122,6 @@
       end
     end
   end
-  # rubocop:enable RSpec/MultipleExpectations
 
   describe "#should_run_sql without 'unless'" do
     [true, :true].each do |refreshonly|
@@ -253,13 +250,13 @@
   describe '#refresh' do
     let(:attributes) { {} }
 
-    it 'syncs command property when command should run' do # rubocop:disable RSpec/MultipleExpectations
+    it 'syncs command property when command should run' do
       expect(subject).to receive(:should_run_sql).with(true).and_return(true)
       expect(subject.property(:command)).to receive(:sync)
       subject.refresh
     end
 
-    it 'does not sync command property when command should not run' do # rubocop:disable RSpec/MultipleExpectations
+    it 'does not sync command property when command should not run' do
       expect(subject).to receive(:should_run_sql).with(true).and_return(false)
       expect(subject.property(:command)).not_to receive(:sync)
       subject.refresh