(CONT-792) - Correct RSpec/EmptyLineAfterExampleGroup

Author: jordanbreen28

.rubocop_todo.yml

@@ -72,20 +72,6 @@ RSpec/DescribeClass:
   Enabled: false
 
 
-# Offense count: 29
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterExampleGroup:
-  Exclude:
-    - 'spec/acceptance/server/grant_spec.rb'
-    - 'spec/defines/server/pg_hba_rule_spec.rb'
-    - 'spec/defines/server/pg_ident_rule_spec.rb'
-    - 'spec/defines/server/recovery_spec.rb'
-    - 'spec/type_aliases/pg_hba_rule_spec.rb'
-    - 'spec/type_aliases/pg_hba_rules_spec.rb'
-    - 'spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb'
-    - 'spec/unit/puppet/type/postgresql_conn_validator.rb'
-    - 'spec/unit/puppet/type/postgresql_psql_spec.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowConsecutiveOneLiners.

spec/acceptance/server/grant_spec.rb

@@ -201,6 +201,7 @@ class { 'postgresql::server': }
       end
     end
   end
+
   ### FUNCTION grants
   context 'sequence' do
     let(:pp) do
@@ -268,6 +269,7 @@ class { 'postgresql::server': }
       end
     end
   end
+
   ### TABLE grants
   context 'table' do
     describe 'GRANT ... ON TABLE' do
@@ -472,6 +474,7 @@ class { 'postgresql::server': }
       end
     end
   end
+
   context 'database' do
     describe 'REVOKE ... ON DATABASE...' do
       it 'do not fail on revoke connect from non-existant user' do

spec/defines/server/pg_hba_rule_spec.rb

@@ -248,6 +248,7 @@ class { 'postgresql::server': }
         is_expected.to contain_concat__fragment('pg_hba_rule_test').with(content: %r{host\s+all\s+all\s+\.domain\.tld\s+md5})
       end
     end
+
     context 'pg_hba_rule with illegal address' do
       let :pre_condition do
         <<-MANIFEST

spec/defines/server/pg_ident_rule_spec.rb

@@ -33,6 +33,7 @@ class { 'postgresql::server': }
       is_expected.to contain_concat__fragment('pg_ident_rule_test').with(content: %r{thatsmymap\s+systemuser\s+dbuser})
     end
   end
+
   context 'not managing pg_ident' do
     let :pre_condition do
       <<-MANIFEST

spec/defines/server/recovery_spec.rb

@@ -33,6 +33,7 @@ class { 'postgresql::server': }
         .with(content: %r{restore_command = 'restore_command'[\n]+recovery_target_timeline = 'recovery_target_timeline'})
     end
   end
+
   context 'not managing recovery' do
     let(:pre_condition) do
       <<-MANIFEST
@@ -53,6 +54,7 @@ class { 'postgresql::server': }
                                           %r{postgresql::server::manage_recovery_conf has been disabled})
     end
   end
+
   context 'not managing recovery, missing param' do
     let(:pre_condition) do
       <<-MANIFEST

spec/type_aliases/pg_hba_rule_spec.rb

@@ -20,6 +20,7 @@
 
     it { is_expected.to allow_value(data) }
   end
+
   context 'invalid data' do
     let :data do
       {
@@ -36,6 +37,7 @@
 
     it { is_expected.not_to allow_value(data) }
   end
+
   context 'empty data' do
     let :data do
       {}

spec/type_aliases/pg_hba_rules_spec.rb

@@ -33,13 +33,15 @@
 
     it { is_expected.to allow_value(data) }
   end
+
   context 'empty' do
     let :data do
       {}
     end
 
     it { is_expected.to allow_value(data) }
   end
+
   context 'invalid data' do
     let :data do
       {
@@ -54,6 +56,7 @@
 
     it { is_expected.not_to allow_value(data) }
   end
+
   context 'empty value' do
     let :data do
       {

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

@@ -21,6 +21,7 @@
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
       end
     end
+
     describe 'with psql_path and db' do
       let(:attributes) do
         {
@@ -41,6 +42,7 @@
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
       end
     end
+
     describe 'with search_path string' do
       let(:attributes) do
         {
@@ -56,6 +58,7 @@
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
       end
     end
+
     describe 'with search_path array' do
       let(:attributes) do
         {
@@ -73,6 +76,7 @@
       end
     end
   end
+
   describe 'with port string' do
     let(:attributes) { { port: '5555' } }
 
@@ -85,6 +89,7 @@
       provider.run_sql_command('SELECT something')
     end
   end
+
   describe 'with connect_settings' do
     let(:attributes) { { connect_settings: { 'PGHOST' => '127.0.0.1' } } }
 

spec/unit/puppet/type/postgresql_conn_validator.rb

@@ -34,11 +34,13 @@
         end
       end
     end
+
     describe 'connect_settings' do
       it 'accepts a hash' do
         expect { described_class.new(name: 'test', connect_settings: { 'PGPASSWORD' => 'test1' }) }.not_to raise_error
       end
     end
+
     describe 'port' do
       it 'does not accept a word' do
         expect { described_class.new(name: 'test', port: 'test') }.to raise_error Puppet::Error

spec/unit/puppet/type/postgresql_psql_spec.rb

@@ -54,21 +54,25 @@
 
       it { is_expected.to eq('psql') }
     end
+
     context 'default value: [:psql_user]' do
       subject { super()[:psql_user] }
 
       it { is_expected.to eq('postgres') }
     end
+
     context 'default value: [:psql_group]' do
       subject { super()[:psql_group] }
 
       it { is_expected.to eq('postgres') }
     end
+
     context 'default value: [:cwd]' do
       subject { super()[:cwd] }
 
       it { is_expected.to eq('/tmp') }
     end
+
     context 'default value: #refreshonly?' do
       subject { super().refreshonly? }
 
@@ -135,6 +139,7 @@
         context 'not refreshing'
         it { expect(subject.should_run_sql).to be_falsey }
       end
+
       context "refreshonly => #{refreshonly.inspect}" do
         let(:attributes) do
           { refreshonly: refreshonly }
@@ -154,6 +159,7 @@
         context 'not refreshing'
         it { expect(subject.should_run_sql).to be_truthy }
       end
+
       context "refreshonly => #{refreshonly.inspect}" do
         let(:attributes) do
           { refreshonly: refreshonly }
@@ -177,6 +183,7 @@
         context 'not refreshing'
         it { expect(subject.should_run_sql).to be_falsey }
       end
+
       context "refreshonly => #{refreshonly.inspect}" do
         let(:attributes) do
           { refreshonly: refreshonly, unless: 'SELECT something' }
@@ -196,6 +203,7 @@
         context 'not refreshing'
         it { expect(subject.should_run_sql).to be_falsey }
       end
+
       context "refreshonly => #{refreshonly.inspect}" do
         let(:attributes) do
           { refreshonly: refreshonly, unless: 'SELECT something' }
@@ -219,6 +227,7 @@
         context 'not refreshing'
         it { expect(subject.should_run_sql).to be_falsey }
       end
+
       context "refreshonly => #{refreshonly.inspect}" do
         let(:attributes) do
           { refreshonly: refreshonly, unless: 'SELECT something' }
@@ -238,6 +247,7 @@
         context 'not refreshing'
         it { expect(subject.should_run_sql).to be_truthy }
       end
+
       context "refreshonly => #{refreshonly.inspect}" do
         let(:attributes) do
           { refreshonly: refreshonly, unless: 'SELECT something' }