(MODULES-11197) Rubocop fixes

Author: BobosilaVictor

.rubocop.yml

@@ -121,7 +121,7 @@ Performance/SortReverse:
 Performance/Squeeze:
   Enabled: true
 Performance/StringInclude:
-  Enabled: true
+  Enabled: false 
 Performance/Sum:
   Enabled: true
 Style/CollectionMethods:

lib/puppet/type/host.rb

@@ -46,8 +46,8 @@ def inclusive?
 
     validate do |value|
       # This regex already includes newline check.
-      raise Puppet::Error, _('Host aliases cannot include whitespace') if value =~ %r{\s}
-      raise Puppet::Error, _('Host aliases cannot be an empty string. Use an empty array to delete all host_aliases ') if value =~ %r{^\s*$}
+      raise Puppet::Error, _('Host aliases cannot include whitespace') if %r{\s}.match?(value)
+      raise Puppet::Error, _('Host aliases cannot be an empty string. Use an empty array to delete all host_aliases ') if %r{^\s*$}.match?(value)
     end
   end
 
@@ -80,7 +80,7 @@ def inclusive?
 
     validate do |value|
       value.split('.').each do |hostpart|
-        if hostpart !~ %r{^([\w]+|[\w][\w\-]+[\w])$}
+        unless %r{^([\w]+|[\w][\w\-]+[\w])$}.match?(hostpart)
           raise Puppet::Error, _('Invalid host name')
         end
       end

spec/acceptance/tests/create_spec.rb

@@ -13,7 +13,7 @@
         on(agent, puppet_resource('host', 'test', 'ensure=present',
                                   'ip=127.0.0.1', "target=#{target}"))
         on(agent, "cat #{target}") do |result|
-          fail_test 'record was not present' if result.stdout !~ %r{^127\.0\.0\.1[[:space:]]+test}
+          fail_test 'record was not present' unless %r{^127\.0\.0\.1[[:space:]]+test}.match?(result.stdout)
         end
       end
 
@@ -23,7 +23,7 @@
 
         on(agent, "cat #{target}") do |result|
           fail_test 'alias was missing' unless
-            result.stdout =~ %r{^127\.0\.0\.7[[:space:]]+test[[:space:]]alias}
+            %r{^127\.0\.0\.7[[:space:]]+test[[:space:]]alias}.match?(result.stdout)
         end
       end
 

spec/acceptance/tests/modify_spec.rb

@@ -16,7 +16,7 @@
 
         on(agent, "cat #{target}") do |result|
           fail_test 'the address was not updated' unless
-            result.stdout =~ %r{^127\.0\.0\.10[[:space:]]+test[[:space:]]+alias[[:space:]]*$}
+            %r{^127\.0\.0\.10[[:space:]]+test[[:space:]]+alias[[:space:]]*$}.match?(result.stdout)
         end
       end
 
@@ -27,7 +27,7 @@
 
         on(agent, "cat #{target}") do |result|
           fail_test 'the alias was not updated' unless
-            result.stdout =~ %r{^127\.0\.0\.8[[:space:]]+test[[:space:]]+banzai[[:space:]]*$}
+            %r{^127\.0\.0\.8[[:space:]]+test[[:space:]]+banzai[[:space:]]*$}.match?(result.stdout)
         end
       end
     end

spec/shared_behaviours/all_parsedfile_providers.rb

@@ -4,7 +4,7 @@
   end
 
   files.flatten.each do |file|
-    it "should rewrite #{file} reasonably unchanged" do
+    it "rewrites #{file} reasonably unchanged" do
       allow(provider).to receive(:default_target).and_return(file)
       provider.prefetch
 

spec/unit/type/host_spec.rb

@@ -12,13 +12,13 @@
 
   describe 'when validating attributes' do
     [:name, :provider].each do |param|
-      it "should have a #{param} parameter" do
+      it "has a #{param} parameter" do
         expect(described_class.attrtype(param)).to eq(:param)
       end
     end
 
     [:ip, :target, :host_aliases, :comment, :ensure].each do |property|
-      it "should have a #{property} property" do
+      it "has a #{property} property" do
         expect(described_class.attrtype(property)).to eq(:property)
       end
     end
@@ -256,7 +256,7 @@
      '0:a:b:c:d:e:f::',
      '::0:a:b:c:d:e:f', # syntactically correct, but bad form (::0:... could be combined)
      'a:b:c:d:e:f:0::'].each do |ip|
-      it "should accept #{ip.inspect} as an IPv6 address" do
+      it "accepts #{ip.inspect} as an IPv6 address" do
         expect { described_class.new(name: 'foo', ip: ip) }.not_to raise_error
       end
     end
@@ -587,7 +587,7 @@
      '1111::3333:4444:5555:6666:7777:8888:',
      '::3333:4444:5555:6666:7777:8888:',
      '::2222:3333:4444:5555:6666:7777:8888:'].each do |ip|
-      it "should reject #{ip.inspect} as an IPv6 address" do
+      it "rejects #{ip.inspect} as an IPv6 address" do
         expect { described_class.new(name: 'foo', ip: ip) }.to raise_error(Puppet::ResourceError, %r{Parameter ip failed})
       end
     end