(CONT-772) Correct RSpec/EmptyLineAfterExample

Author: LukasAud

.rubocop_todo.yml

@@ -76,8 +76,8 @@ RSpec/DescribeClass:
 # Offense count: 239
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Enabled: false
+# RSpec/EmptyLineAfterExample:
+#   Enabled: false
 
 # Offense count: 270
 # This cop supports safe autocorrection (--autocorrect).

spec/acceptance/apache_ssl_spec.rb

@@ -23,6 +23,7 @@ class { 'apache':
 
     describe file("#{apache_hash['mod_ssl_dir']}/ssl.conf") do
       it { is_expected.to be_file }
+
       if os[:family].include?('redhat') && os[:release].to_i >= 8
         it { is_expected.not_to contain 'SSLProtocol' }
       elsif ['debian', 'ubuntu'].include?(os[:family])
@@ -40,6 +41,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLCACertificateFile    "/tmp/ssl_ca"' }
       it { is_expected.to contain 'SSLCARevocationPath     "/tmp/ssl_crl_path"' }
       it { is_expected.to contain 'SSLCARevocationFile     "/tmp/ssl_crl"' }
+
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    chain' }
       else
@@ -107,6 +109,7 @@ class { 'apache':
       it { is_expected.to contain 'SSLVerifyClient         require' }
       it { is_expected.to contain 'SSLVerifyDepth          1' }
       it { is_expected.to contain 'SSLOptions test test1' }
+
       if apache_hash['version'] == '2.4'
         it { is_expected.to contain 'SSLCARevocationCheck    chain flag' }
       else

spec/acceptance/vhost_spec.rb

@@ -315,6 +315,7 @@ class { 'apache': }
       it 'answers to files.example.net #stdout' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
+
       it 'answers to files.example.net #stderr' do
         result = run_shell('/usr/bin/curl -sSf files.example.net:80/index.html.bak', expect_failures: true)
         expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
@@ -369,14 +370,17 @@ class { 'apache': }
       it 'answers to files.example.net #stdout' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/').stdout).to eq("Hello World\n")
       end
+
       it 'answers to files.example.net #stdout foo' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/foo/').stdout).to eq("Hello Foo\n")
       end
+
       it 'answers to files.example.net #stderr' do
         result = run_shell('/usr/bin/curl -sSf files.example.net:80/private.html', expect_failures: true)
         expect(result.stderr).to match(%r{curl: \(22\) The requested URL returned error: 403})
         expect(result.exit_code).to eq 22
       end
+
       it 'answers to files.example.net #stdout bar' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/bar/bar.html').stdout).to eq("Hello Bar\n")
       end
@@ -411,6 +415,7 @@ class { 'apache': }
       it 'answers to files.example.net #stdout' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/index.html').stdout).to eq("Hello World\n")
       end
+
       it 'answers to files.example.net #stdout regex' do
         expect(run_shell('/usr/bin/curl -sSf files.example.net:80/server-status?auto').stdout).to match(%r{Scoreboard: })
       end
@@ -576,6 +581,7 @@ class { 'apache': default_vhost => false, }
         expect(r.stdout).to eq("Hello from localhost\n")
       end
     end
+
     it 'gets a response from the back end #exit_code' do
       run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
@@ -621,6 +627,7 @@ class { 'apache': default_vhost => false, }
         expect(r.stdout).to eq("Hello from localhost\n")
       end
     end
+
     it 'gets a response from the back end #exit_code' do
       run_shell('/usr/bin/curl --max-redirs 0 proxy.example.com:80') do |r|
         expect(r.exit_code).to eq(0)
@@ -967,6 +974,7 @@ class { 'apache': }
       it 'applies cleanly' do
         _result = apply_manifest(pp, catch_failures: true)
       end
+
       describe file("#{apache_hash['vhost_dir']}/25-test.servername.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain '  ErrorLog "/tmp/test.servername_error.log' }
@@ -986,6 +994,7 @@ class { 'apache': }
       it 'applies cleanly' do
         _result = apply_manifest(pp, catch_failures: true)
       end
+
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain '  ErrorLog "/tmp/test.server_error.log' }
@@ -1147,6 +1156,7 @@ class { 'apache::mod::wsgi': }
       it 'import_script applies cleanly' do
         apply_manifest(pp, catch_failures: true)
       end
+
       describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
         it { is_expected.to be_file }
         it { is_expected.to contain 'WSGIApplicationGroup %{GLOBAL}' }
@@ -1212,6 +1222,7 @@ class { 'apache::mod::shib': }
     it 'applies cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'ShibCompatValidUser On' }
@@ -1241,6 +1252,7 @@ class { 'apache': }
     it 'applys cleanly' do
       apply_manifest(pp, catch_failures: true)
     end
+
     describe file("#{apache_hash['vhost_dir']}/25-test.server.conf") do
       it { is_expected.to be_file }
       it { is_expected.to contain 'OIDCProviderMetadataURL https://login.example.com/.well-known/openid-configuration' }

spec/classes/apache_spec.rb

@@ -7,45 +7,54 @@
     include_examples 'Debian 11'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_package('httpd').with(
         'notify' => 'Class[Apache::Service]',
         'ensure' => 'installed',
       )
     }
+
     it { is_expected.to contain_user('www-data') }
     it { is_expected.to contain_group('www-data') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/sites-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/mods-enabled').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/mods-available').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'false'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it { is_expected.to contain_file('/etc/apache2/apache2.conf').without_content(%r{ServerAdmin}) }
+
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
+
     # Assert that load files are placed and symlinked for these mods, but no conf file.
     ['auth_basic', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
@@ -54,13 +63,15 @@
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
       }
+
       it { is_expected.not_to contain_file("#{modname}.conf") }
       it { is_expected.not_to contain_file("#{modname}.conf symlink") }
     end
@@ -125,19 +136,22 @@
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.load symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.load",
           'ensure' => 'link',
           'target' => "/etc/apache2/mods-available/#{modname}.load",
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.conf").with(
           'path' => "/etc/apache2/mods-available/#{modname}.conf",
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.conf symlink").with(
           'path' => "/etc/apache2/mods-enabled/#{modname}.conf",
@@ -198,6 +212,7 @@
           is_expected.to contain_file('/etc/apache2/apache2.conf').with_content reg
         end
       end
+
       it 'Not expected to contain' do
         unexpected.each do |reg|
           is_expected.to contain_file('/etc/apache2/apache2.conf').without_content reg
@@ -229,32 +244,38 @@
     include_examples 'RedHat 8'
 
     it { is_expected.to contain_class('apache::params') }
+
     it {
       is_expected.to contain_package('httpd').with(
         'notify' => 'Class[Apache::Service]',
         'ensure' => 'installed',
       )
     }
+
     it { is_expected.to contain_user('apache') }
     it { is_expected.to contain_group('apache') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/var/www/html').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/etc/httpd/conf.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_concat('/etc/httpd/conf/ports.conf').with(
         'owner' => 'root', 'group' => 'root',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
+
     describe 'Alternate confd/mod/vhosts directory' do
       let :params do
         {
@@ -280,6 +301,7 @@
             "/etc/httpd/mod.d/#{modname}.load",
           )
         }
+
         it {
           is_expected.not_to contain_file("#{modname}.conf").with_path(
             "/etc/httpd/mod.d/#{modname}.conf",
@@ -294,6 +316,7 @@
             "/etc/httpd/mod.d/#{modname}.load",
           )
         }
+
         it {
           is_expected.to contain_file("#{modname}.conf").with_path(
             "/etc/httpd/mod.d/#{modname}.conf",
@@ -521,29 +544,34 @@
     it { is_expected.to contain_user('www') }
     it { is_expected.to contain_group('www') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/usr/local/www/apache24/data').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/usr/local/etc/apache24/Vhosts').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/usr/local/etc/apache24/Modules').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_concat('/usr/local/etc/apache24/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',
         'mode' => '0644'
       ).that_notifies('Class[Apache::Service]')
     }
+
     # Assert that load files are placed for these mods, but no conf file.
     ['auth_basic', 'authn_core', 'authn_file', 'authz_groupfile', 'authz_host', 'authz_user', 'dav', 'env'].each do |modname|
       it {
@@ -552,6 +580,7 @@
           'ensure' => 'file',
         )
       }
+
       it { is_expected.not_to contain_file("#{modname}.conf") }
     end
 
@@ -563,6 +592,7 @@
           'ensure' => 'file',
         )
       }
+
       it {
         is_expected.to contain_file("#{modname}.conf").with(
           'path' => "/usr/local/etc/apache24/Modules/#{modname}.conf",
@@ -578,23 +608,27 @@
     it { is_expected.to contain_user('apache') }
     it { is_expected.to contain_group('apache') }
     it { is_expected.to contain_class('apache::service') }
+
     it {
       is_expected.to contain_file('/var/www/localhost/htdocs').with(
         'ensure' => 'directory',
       )
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/vhosts.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_file('/etc/apache2/modules.d').with(
         'ensure' => 'directory', 'recurse' => 'true',
         'purge' => 'true'
       ).that_notifies('Class[Apache::Service]').that_requires('Package[httpd]')
     }
+
     it {
       is_expected.to contain_concat('/etc/apache2/ports.conf').with(
         'owner' => 'root', 'group' => 'wheel',

spec/classes/dev_spec.rb

@@ -18,10 +18,12 @@
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_class('apache::params') }
+
         case facts[:os]['name']
         when 'Debian'
           it { is_expected.to contain_package('libaprutil1-dev') }
           it { is_expected.to contain_package('libapr1-dev') }
+
           it { is_expected.to contain_package('apache2-prefork-dev') } if facts[:os]['release']['major'].to_i < 8
         when 'Ubuntu'
           it { is_expected.to contain_package('apache2-dev') }

spec/classes/mod/auth_cas_spec.rb

@@ -63,6 +63,7 @@
       it { is_expected.to contain_package('mod_auth_cas') }
       it { is_expected.to contain_file('auth_cas.conf').with_path('/etc/httpd/conf.modules.d/auth_cas.conf') }
       it { is_expected.to contain_file('/var/cache/mod_auth_cas/').with_owner('apache') }
+
       it {
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASRootProxiedAs http://test.server$})
         is_expected.to contain_concat__fragment('test.server-auth_cas').with(content: %r{^\s+CASCookiePath /my/cas/path$})

spec/classes/mod/auth_openidc_spec.rb

@@ -31,6 +31,7 @@
       it { is_expected.to contain_class('apache::mod::authz_user') }
       it { is_expected.to contain_apache__mod('auth_openidc') }
       it { is_expected.to contain_package('mod_auth_openidc') }
+
       it do
         is_expected.to contain_package('dnf-module-mod_auth_openidc')
           .with_ensure('present')