Adapt to rubocop 1.22

Comply with new rubocop configuration
grant-veepshosting · Mar 22, 2022 · 9c887b4 · 9c887b4
1 parent 99aa23d
commit 9c887b4
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 51 deletions.
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 
 case fact('osfamily')
@@ -75,13 +77,16 @@ class { 'fail2ban':
       describe package(package_name) do
         it { is_expected.not_to be_installed }
       end
+
       describe file(config_file_path) do
         it { is_expected.to be_file }
       end
+
       describe service(service_name) do
         it { is_expected.not_to be_running }
         # The docker images of Debian do not use systemd, the following test
         # cannot be performed on these images.
+
         it { is_expected.not_to be_enabled } if fact('osfamily') != 'Debian'
       end
     end
@@ -102,9 +107,11 @@ class { 'fail2ban':
       describe package(package_name) do
         it { is_expected.not_to be_installed }
       end
+
       describe file(config_file_path) do
         it { is_expected.not_to be_file }
       end
+
       describe service(service_name) do
         it { is_expected.not_to be_running }
         it { is_expected.not_to be_enabled }
@@ -243,6 +250,7 @@ class { 'fail2ban': }
         expect(fail2ban_status.output).to contain ssh_jail
       end
     end
+
     context 'when service start/stop notification are disabled' do
       it 'is expected.to have empty sshd actions' do
         pp = <<-EOS
@@ -265,6 +273,5 @@ class { 'fail2ban':
         end
       end
     end
-    # rubocop:enable RSpec/MultipleExpectations
   end
 end
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'fail2ban', type: :class do
@@ -53,13 +55,15 @@
               'ensure' => 'absent'
             )
           end
+
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'present',
-              'notify'  => 'Service[fail2ban]',
+              'ensure' => 'present',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
+
           it do
             is_expected.to contain_service('fail2ban').with(
               'ensure' => 'stopped',
@@ -82,13 +86,15 @@
               'ensure' => 'purged'
             )
           end
+
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'absent',
-              'notify'  => 'Service[fail2ban]',
+              'ensure' => 'absent',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
+
           it do
             is_expected.to contain_service('fail2ban').with(
               'ensure' => 'stopped',
@@ -102,8 +108,8 @@
         context 'defaults' do
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'present',
-              'notify'  => 'Service[fail2ban]',
+              'ensure' => 'present',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
@@ -118,12 +124,12 @@
 
           it do
             is_expected.to contain_file('fail2ban.dir').with(
-              'ensure'  => 'directory',
-              'force'   => false,
-              'purge'   => false,
+              'ensure' => 'directory',
+              'force' => false,
+              'purge' => false,
               'recurse' => true,
-              'source'  => 'puppet:///modules/profile/fail2ban/etc/fail2ban',
-              'notify'  => 'Service[fail2ban]',
+              'source' => 'puppet:///modules/profile/fail2ban/etc/fail2ban',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
@@ -139,12 +145,12 @@
 
           it do
             is_expected.to contain_file('fail2ban.dir').with(
-              'ensure'  => 'directory',
-              'force'   => true,
-              'purge'   => true,
+              'ensure' => 'directory',
+              'force' => true,
+              'purge' => true,
               'recurse' => true,
-              'source'  => 'puppet:///modules/profile/fail2ban/etc/fail2ban',
-              'notify'  => 'Service[fail2ban]',
+              'source' => 'puppet:///modules/profile/fail2ban/etc/fail2ban',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
@@ -159,9 +165,9 @@
 
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'present',
-              'source'  => 'puppet:///modules/profile/fail2ban/etc/fail2ban/jail.conf',
-              'notify'  => 'Service[fail2ban]',
+              'ensure' => 'present',
+              'source' => 'puppet:///modules/profile/fail2ban/etc/fail2ban/jail.conf',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
@@ -176,9 +182,9 @@
 
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'present',
+              'ensure' => 'present',
               'content' => %r{THIS FILE IS MANAGED BY PUPPET},
-              'notify'  => 'Service[fail2ban]',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             )
           end
@@ -193,9 +199,9 @@
 
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'present',
+              'ensure' => 'present',
               'content' => %r{THIS FILE IS MANAGED BY PUPPET},
-              'notify'  => 'Service[fail2ban]',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             ).with_content(%r{^chain = INPUT$})
           end
@@ -213,9 +219,9 @@
 
           it do
             is_expected.to contain_file('fail2ban.conf').with(
-              'ensure'  => 'present',
+              'ensure' => 'present',
               'content' => %r{THIS FILE IS MANAGED BY PUPPET},
-              'notify'  => 'Service[fail2ban]',
+              'notify' => 'Service[fail2ban]',
               'require' => 'Package[fail2ban]'
             ).with_content(%r{^chain = INPUT$})
           end
@@ -232,9 +238,9 @@
 
             it do
               is_expected.to contain_file('00-firewalld.conf').with(
-                'ensure'  => 'present',
-                'path'    => '/etc/fail2ban/jail.d/00-firewalld.conf',
-                'notify'  => 'Service[fail2ban]',
+                'ensure' => 'present',
+                'path' => '/etc/fail2ban/jail.d/00-firewalld.conf',
+                'notify' => 'Service[fail2ban]',
                 'require' => 'Package[fail2ban]'
               )
             end
@@ -249,8 +255,8 @@
 
             it do
               is_expected.to contain_file('defaults-debian.conf').with(
-                'ensure'  => 'present',
-                'path'    => '/etc/fail2ban/jail.d/defaults-debian.conf',
+                'ensure' => 'present',
+                'path' => '/etc/fail2ban/jail.d/defaults-debian.conf',
                 'require' => 'Package[fail2ban]'
               )
             end

diff --git a/spec/defines/define_spec.rb b/spec/defines/define_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'fail2ban::define', type: :define do
@@ -19,9 +21,9 @@
 
         it do
           is_expected.to contain_file('define_fail2ban.conf').with(
-            'ensure'  => 'present',
-            'source'  => 'puppet:///modules/fail2ban/Debian/10/etc/fail2ban/jail.conf',
-            'notify'  => 'Service[fail2ban]',
+            'ensure' => 'present',
+            'source' => 'puppet:///modules/fail2ban/Debian/10/etc/fail2ban/jail.conf',
+            'notify' => 'Service[fail2ban]',
             'require' => 'Package[fail2ban]'
           )
         end
@@ -36,9 +38,9 @@
 
         it do
           is_expected.to contain_file('define_fail2ban.conf').with(
-            'ensure'  => 'present',
+            'ensure' => 'present',
             'content' => %r{THIS FILE IS MANAGED BY PUPPET},
-            'notify'  => 'Service[fail2ban]',
+            'notify' => 'Service[fail2ban]',
             'require' => 'Package[fail2ban]'
           )
         end
@@ -53,9 +55,9 @@
 
         it do
           is_expected.to contain_file('define_fail2ban.conf').with(
-            'ensure'  => 'present',
+            'ensure' => 'present',
             'content' => %r{THIS FILE IS MANAGED BY PUPPET},
-            'notify'  => 'Service[fail2ban]',
+            'notify' => 'Service[fail2ban]',
             'require' => 'Package[fail2ban]'
           ).with_content(%r{^chain = INPUT$})
         end
@@ -73,9 +75,9 @@
 
         it do
           is_expected.to contain_file('define_fail2ban.conf').with(
-            'ensure'  => 'present',
+            'ensure' => 'present',
             'content' => %r{THIS FILE IS MANAGED BY PUPPET},
-            'notify'  => 'Service[fail2ban]',
+            'notify' => 'Service[fail2ban]',
             'require' => 'Package[fail2ban]'
           ).with_content(%r{^chain = INPUT$})
         end

diff --git a/spec/defines/fail2ban_jail_spec.rb b/spec/defines/fail2ban_jail_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'fail2ban::jail' do
@@ -12,9 +14,9 @@
 
       let(:params) do
         {
-          'logpath'            => '/var/log/syslog',
-          'filter_failregex'   => 'Login failed for user .* from <HOST>',
-          'filter_maxlines'    => 10,
+          'logpath' => '/var/log/syslog',
+          'filter_failregex' => 'Login failed for user .* from <HOST>',
+          'filter_maxlines' => 10,
           'filter_datepattern' => '%%Y-%%m-%%d %%H:%%M(?::%%S)?'
         }
       end
@@ -25,32 +27,32 @@
 
       it do
         is_expected.to contain_file('custom_jail_spec_test_jail').with(
-          'ensure'  => 'file',
-          'notify'  => 'Service[fail2ban]',
+          'ensure' => 'file',
+          'notify' => 'Service[fail2ban]',
           'content' => %r{\[spec_test_jail\]}
         )
       end
 
       it do
         is_expected.to contain_file('custom_filter_spec_test_jail').with(
-          'ensure'  => 'file',
-          'notify'  => 'Service[fail2ban]',
+          'ensure' => 'file',
+          'notify' => 'Service[fail2ban]',
           'content' => %r{failregex = Login failed for user .* from <HOST>}
         )
       end
 
       it do
         is_expected.to contain_file('custom_filter_spec_test_jail').with(
-          'ensure'  => 'file',
-          'notify'  => 'Service[fail2ban]',
+          'ensure' => 'file',
+          'notify' => 'Service[fail2ban]',
           'content' => %r{maxlines = 10}
         )
       end
 
       it do
         is_expected.to contain_file('custom_filter_spec_test_jail').with(
-          'ensure'  => 'file',
-          'notify'  => 'Service[fail2ban]',
+          'ensure' => 'file',
+          'notify' => 'Service[fail2ban]',
           'content' => %r{datepattern = %%Y-%%m-%%d %%H:%%M(?::%%S)?}
         )
       end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|