(CONT-801) Autocorrect safe group 4

LukasAud · LukasAud · commit 02988680f566 · 2023-05-23T16:26:07.000+01:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -140,45 +140,11 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 25
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/EmptyLineAfterExampleGroup:
-  Exclude:
-    - 'spec/functions/defined_with_params_spec.rb'
-    - 'spec/functions/stdlib_ensure_spec.rb'
-    - 'spec/functions/swapcase_spec.rb'
-    - 'spec/functions/validate_cmd_spec.rb'
-    - 'spec/type_aliases/email_spec.rb'
-    - 'spec/type_aliases/ensure_package_spec.rb'
-    - 'spec/unit/facter/util/puppet_settings_spec.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
-
-# Offense count: 13
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterHook:
-  Exclude:
-    - 'spec/functions/delete_undef_values_spec.rb'
-    - 'spec/functions/deprecation_spec.rb'
-    - 'spec/functions/get_module_path_spec.rb'
-    - 'spec/functions/loadjson_spec.rb'
-    - 'spec/functions/time_spec.rb'
-    - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
-
 # Offense count: 10
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 9
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: CustomTransform, IgnoredWords, DisallowedExamples.
-# DisallowedExamples: works
-RSpec/ExampleWording:
-  Exclude:
-    - 'spec/functions/validate_legacy_spec.rb'
-
 # Offense count: 2
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
@@ -187,12 +153,6 @@ RSpec/FilePath:
     - 'spec/unit/puppet/provider/file_line/ruby_spec_alter.rb'
     - 'spec/unit/puppet/provider/file_line/ruby_spec_use_cases.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/HooksBeforeExamples:
-  Exclude:
-    - 'spec/functions/deprecation_spec.rb'
-
 # Offense count: 198
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -240,16 +200,6 @@ RSpec/PendingWithoutReason:
     - 'spec/functions/is_a_spec.rb'
     - 'spec/functions/type_of_spec.rb'
 
-# Offense count: 13
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ReceiveNever:
-  Exclude:
-    - 'spec/functions/deprecation_spec.rb'
-    - 'spec/functions/loadjson_spec.rb'
-    - 'spec/functions/loadyaml_spec.rb'
-    - 'spec/functions/validate_legacy_spec.rb'
-    - 'spec/unit/facter/util/puppet_settings_spec.rb'
-
 # Offense count: 4
 RSpec/RepeatedExampleGroupDescription:
   Exclude:
diff --git a/spec/functions/defined_with_params_spec.rb b/spec/functions/defined_with_params_spec.rb
@@ -6,6 +6,7 @@
   describe 'when no resource is specified' do
     it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   end
+
   describe 'when compared against a resource with no attributes' do
     let :pre_condition do
       'user { "dan": }'
@@ -52,6 +53,7 @@
     context 'with reference' do
       it { is_expected.to run.with_params(Puppet::Resource.new('User[dan]'), {}).and_return(true) }
     end
+
     if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0
       context 'with array' do
         it 'fails' do
diff --git a/spec/functions/delete_undef_values_spec.rb b/spec/functions/delete_undef_values_spec.rb
@@ -19,6 +19,7 @@
           pending("review behaviour when being passed undef as #{undef_value.inspect}") if undef_value == ''
           pending("review behaviour when being passed undef as #{undef_value.inspect}") if undef_value == :undef && is_puppet_6
         end
+
         it { is_expected.to run.with_params([undef_value]).and_return([]) }
         it { is_expected.to run.with_params(['one', undef_value, 'two', 'three']).and_return(['one', 'two', 'three']) }
         it { is_expected.to run.with_params(['ớņέ', undef_value, 'ŧשּׁō', 'ŧħґëə']).and_return(['ớņέ', 'ŧשּׁō', 'ŧħґëə']) }
@@ -42,6 +43,7 @@
           pending("review behaviour when being passed undef as #{undef_value.inspect}") if undef_value == ''
           pending("review behaviour when being passed undef as #{undef_value.inspect}") if undef_value == :undef && is_puppet_6
         end
+
         it { is_expected.to run.with_params('key' => undef_value).and_return({}) }
 
         it {
diff --git a/spec/functions/deprecation_spec.rb b/spec/functions/deprecation_spec.rb
@@ -9,6 +9,11 @@
       Puppet.settings[:strict] = :warning
     end
 
+    after(:each) do
+      # this is to reset the strict variable to default
+      Puppet.settings[:strict] = :warning
+    end
+
     it { is_expected.not_to eq(nil) }
     it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
 
@@ -36,34 +41,31 @@
 
     it 'fails twice with message, with multiple calls. when strict= :error' do
       Puppet.settings[:strict] = :error
-      expect(Puppet).to receive(:warning).with(include('heelo')).never
+      expect(Puppet).not_to receive(:warning).with(include('heelo'))
       (0..1).each do |_i|
         is_expected.to run.with_params('key', 'heelo').and_raise_error(RuntimeError, %r{deprecation. key. heelo})
       end
     end
 
     it 'displays nothing, despite multiple calls. strict= :off' do
       Puppet.settings[:strict] = :off
-      expect(Puppet).to receive(:warning).with(include('heelo')).never
+      expect(Puppet).not_to receive(:warning).with(include('heelo'))
       (0..1).each do |_i|
         is_expected.to run.with_params('key', 'heelo')
       end
     end
-
-    after(:each) do
-      # this is to reset the strict variable to default
-      Puppet.settings[:strict] = :warning
-    end
   end
 elsif Puppet.version.to_f < 4.0
   # Puppet version < 4 will use these tests.
   describe 'deprecation' do
     after(:each) do
       ENV.delete('STDLIB_LOG_DEPRECATIONS')
     end
+
     before(:each) do
       ENV['STDLIB_LOG_DEPRECATIONS'] = 'true'
     end
+
     it { is_expected.not_to eq(nil) }
     it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
 
diff --git a/spec/functions/get_module_path_spec.rb b/spec/functions/get_module_path_spec.rb
@@ -30,6 +30,7 @@ def initialize(path)
       before(:each) do
         allow(Puppet::Module).to receive(:find).with('foo', 'rp_env').and_return(path_of_module_foo)
       end
+
       it 'runs against foo' do
         is_expected.to run.with_params('foo').and_return(path_of_module_foo.path)
       end
@@ -47,6 +48,7 @@ def initialize(path)
       before(:each) do
         allow(Puppet::Module).to receive(:find).with('foo', 'test').and_return(path_of_module_foo)
       end
+
       it 'runs against foo' do
         is_expected.to run.with_params('foo').and_return(path_of_module_foo.path)
       end
diff --git a/spec/functions/loadjson_spec.rb b/spec/functions/loadjson_spec.rb
@@ -28,11 +28,12 @@
       before(:each) do
         allow(File).to receive(:exists?).with(filename).and_return(false).once
         if Puppet::PUPPETVERSION[0].to_i < 8
-          allow(PSON).to receive(:load).never
+          allow(PSON).not_to receive(:load)
         else
-          allow(JSON).to receive(:parse).never
+          allow(JSON).not_to receive(:parse)
         end
       end
+
       it { is_expected.to run.with_params(filename, 'default' => 'value').and_return('default' => 'value') }
       it { is_expected.to run.with_params(filename, 'đẽƒằưļŧ' => '٧ẵłựέ').and_return('đẽƒằưļŧ' => '٧ẵłựέ') }
       it { is_expected.to run.with_params(filename, 'デフォルト' => '値').and_return('デフォルト' => '値') }
@@ -59,6 +60,7 @@
           allow(JSON).to receive(:parse).with(json).and_return(data).once
         end
       end
+
       it { is_expected.to run.with_params(filename).and_return(data) }
     end
 
@@ -81,6 +83,7 @@
           allow(JSON).to receive(:parse).with(json).once.and_raise StandardError, 'Something terrible have happened!'
         end
       end
+
       it { is_expected.to run.with_params(filename, 'default' => 'value').and_return('default' => 'value') }
     end
 
diff --git a/spec/functions/loadyaml_spec.rb b/spec/functions/loadyaml_spec.rb
@@ -11,7 +11,7 @@
 
     it "'default' => 'value'" do
       expect(File).to receive(:exists?).with(filename).and_return(false).once
-      expect(YAML).to receive(:load_file).never
+      expect(YAML).not_to receive(:load_file)
       is_expected.to run.with_params(filename, 'default' => 'value').and_return('default' => 'value')
     end
   end
diff --git a/spec/functions/stdlib_ensure_spec.rb b/spec/functions/stdlib_ensure_spec.rb
@@ -7,12 +7,14 @@
     it { is_expected.to run.with_params(true).and_return('present') }
     it { is_expected.to run.with_params(false).and_return('absent') }
   end
+
   context 'work with service resource' do
     it { is_expected.to run.with_params('present', 'service').and_return('running') }
     it { is_expected.to run.with_params(true, 'service').and_return('running') }
     it { is_expected.to run.with_params('absent', 'service').and_return('stopped') }
     it { is_expected.to run.with_params(false, 'service').and_return('stopped') }
   end
+
   ['directory', 'link', 'mounted', 'file'].each do |resource|
     context "work with #{resource} resource" do
       it { is_expected.to run.with_params('present', resource).and_return(resource) }
diff --git a/spec/functions/swapcase_spec.rb b/spec/functions/swapcase_spec.rb
@@ -21,6 +21,7 @@
     it { is_expected.to run.with_params('ONE').and_return('one') }
     it { is_expected.to run.with_params('oNe').and_return('OnE') }
   end
+
   describe 'with arrays as inputs' do
     it { is_expected.to run.with_params([]).and_return([]) }
 
@@ -33,13 +34,15 @@
       it { is_expected.to run.with_params(['ONE', 'OnE']).and_return(['one', 'oNe']) }
       it { is_expected.to run.with_params(['oNe', 'one']).and_return(['OnE', 'ONE']) }
     end
+
     describe 'containing mixed types' do
       it { is_expected.to run.with_params(['OnE', {}]).and_return(['oNe', {}]) }
       it { is_expected.to run.with_params(['OnE', 1]).and_return(['oNe', 1]) }
       it { is_expected.to run.with_params(['OnE', []]).and_return(['oNe', []]) }
       it { is_expected.to run.with_params(['OnE', ['two']]).and_return(['oNe', ['two']]) }
     end
   end
+
   it 'accepts objects which extend String' do
     is_expected.to run.with_params(AlsoString.new('OnE')).and_return('oNe')
   end
diff --git a/spec/functions/time_spec.rb b/spec/functions/time_spec.rb
@@ -12,6 +12,7 @@
       test_time = Time.utc(2006, 10, 13, 8, 15, 11)
       allow(Time).to receive(:new).with(no_args).and_return(test_time).once
     end
+
     it { is_expected.to run.with_params.and_return(1_160_727_311) }
     it { is_expected.to run.with_params('').and_return(1_160_727_311) }
     it { is_expected.to run.with_params([]).and_return(1_160_727_311) }
diff --git a/spec/functions/validate_cmd_spec.rb b/spec/functions/validate_cmd_spec.rb
@@ -36,6 +36,7 @@
 
       it { is_expected.to run.with_params('', "#{touch} % /no/such/file", 'custom error').and_raise_error(Puppet::ParseError, %r{custom error}) }
     end
+
     context 'without % placeholder' do
       it {
         is_expected.to run
diff --git a/spec/functions/validate_legacy_spec.rb b/spec/functions/validate_legacy_spec.rb
@@ -10,16 +10,16 @@
     describe 'when passing the type assertion' do
       it 'passes with a deprecation warning' do
         expect(subject.func).to receive(:call_function).with('deprecation', 'validate_legacy', include('deprecated')).once
-        expect(scope).to receive(:function_validate_foo).never
-        expect(Puppet).to receive(:notice).never
+        expect(scope).not_to receive(:function_validate_foo)
+        expect(Puppet).not_to receive(:notice)
         is_expected.to run.with_params('Integer', 'validate_foo', 5)
       end
     end
 
     describe 'when failing the type assertion' do
       it 'fails with a helpful message' do
         expect(subject.func).to receive(:call_function).with('deprecation', 'validate_legacy', include('deprecated')).once
-        expect(scope).to receive(:function_validate_foo).never
+        expect(scope).not_to receive(:function_validate_foo)
         expect(subject.func).to receive(:call_function).with('fail', 'validate_legacy(Integer, ...) expects an Integer value, got String').once
         is_expected.to run.with_params('Integer', 'validate_foo', '5')
       end
@@ -28,17 +28,17 @@
     describe 'when passing in undef' do
       it 'works' do
         expect(subject.func).to receive(:call_function).with('deprecation', 'validate_legacy', include('deprecated')).once
-        expect(scope).to receive(:function_validate_foo).never
-        expect(Puppet).to receive(:notice).never
+        expect(scope).not_to receive(:function_validate_foo)
+        expect(Puppet).not_to receive(:notice)
         is_expected.to run.with_params('Optional[Integer]', 'validate_foo', :undef)
       end
     end
 
     describe 'when passing in multiple arguments' do
       it 'passes with a deprecation message' do
         expect(subject.func).to receive(:call_function).with('deprecation', 'validate_legacy', include('deprecated')).once
-        expect(scope).to receive(:function_validate_foo).never
-        expect(Puppet).to receive(:notice).never
+        expect(scope).not_to receive(:function_validate_foo)
+        expect(Puppet).not_to receive(:notice)
         is_expected.to run.with_params('Optional[Integer]', 'validate_foo', :undef, 1, 'foo')
       end
     end
diff --git a/spec/type_aliases/email_spec.rb b/spec/type_aliases/email_spec.rb
@@ -36,6 +36,7 @@
       end
     end
   end
+
   describe 'invalid handling' do
     ['plainaddress',
      '#@%^%#$@#$@#.com',
diff --git a/spec/type_aliases/ensure_package_spec.rb b/spec/type_aliases/ensure_package_spec.rb
@@ -20,6 +20,7 @@
       end
     end
   end
+
   describe 'No complex types can match' do
     context 'Garbage inputs, no complex or non string types can match' do
       [
diff --git a/spec/unit/facter/util/puppet_settings_spec.rb b/spec/unit/facter/util/puppet_settings_spec.rb
@@ -15,10 +15,11 @@
       end
 
       it 'does not yield to the block' do
-        expect(Puppet).to receive(:[]).never
+        expect(Puppet).not_to receive(:[])
         expect(subject.with_puppet { Puppet[:vardir] }).to be_nil
       end
     end
+
     context 'with Puppet loaded' do
       # module Puppet
       module Puppet; end
diff --git a/spec/unit/puppet/provider/file_line/ruby_spec.rb b/spec/unit/puppet/provider/file_line/ruby_spec.rb
@@ -41,6 +41,7 @@
         expect(provider).to be_exists
       end
     end
+
     context 'when line does not exist' do
       let(:content) { 'foo bar' }
 
@@ -132,6 +133,7 @@
         expect(File.read(tmpfile).chomp).to eql("foo\nbar")
       end
     end
+
     context 'when not matching' do
       let(:content) { "foo3\nbar" }
 
diff --git a/spec/unit/puppet/provider/file_line/ruby_spec_alter.rb b/spec/unit/puppet/provider/file_line/ruby_spec_alter.rb
