Follow-up clean-up of Ruby < 2.6

lib/rubocop/cop/lint/redundant_require_statement.rb

@@ -12,8 +12,6 @@ module Lint
       #   ruby 2.2.8p477 (2017-09-14 revision 59906) [x86_64-darwin13]
       #   ["enumerator.so", "rational.so", "complex.so", "thread.rb"]
       #
-      # This cop targets Ruby 2.2 or higher containing these 4 features.
-      #
       # @example
       #   # bad
       #   require 'unloaded_feature'
@@ -24,9 +22,6 @@ module Lint
       class RedundantRequireStatement < Base
         include RangeHelp
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.2
 
         MSG = 'Remove unnecessary `require` statement.'
         RESTRICT_ON_SEND = %i[require].freeze

lib/rubocop/cop/lint/safe_navigation_chain.rb

@@ -25,9 +25,6 @@ module Lint
       #   x&.foo || bar
       class SafeNavigationChain < Base
         include NilMethods
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.3
 
         MSG = 'Do not chain ordinary method call after safe navigation operator.'
 

lib/rubocop/cop/lint/unified_integer.rb

@@ -33,8 +33,6 @@ def on_const(node)
           return unless klass
 
           add_offense(node, message: format(MSG, klass: klass)) do |corrector|
-            next if target_ruby_version <= 2.3
-
             corrector.replace(node.loc.name, 'Integer')
           end
         end

lib/rubocop/cop/style/dir.rb

@@ -18,9 +18,6 @@ module Style
       #   path = __dir__
       class Dir < Base
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.0
 
         MSG = "Use `__dir__` to get an absolute path to the current file's directory."
         RESTRICT_ON_SEND = %i[expand_path dirname].freeze

lib/rubocop/cop/style/frozen_string_literal_comment.rb

@@ -86,9 +86,6 @@ class FrozenStringLiteralComment < Base
         include FrozenStringLiteral
         include RangeHelp
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.3
 
         MSG_MISSING_TRUE = 'Missing magic comment `# frozen_string_literal: true`.'
         MSG_MISSING = 'Missing frozen string literal comment.'

lib/rubocop/cop/style/hash_transform_keys.rb

@@ -7,8 +7,6 @@ module Style
       # `_.map {...}.to_h`, and `Hash[_.map {...}]` that are actually just
       # transforming the keys of a hash, and tries to use a simpler & faster
       # call to `transform_keys` instead.
-      # It should only be enabled on Ruby version 2.5 or newer.
-      # (`transform_keys` was added in Ruby 2.5.)
       #
       # @safety
       #   This cop is unsafe, as it can produce false positives if we are
@@ -28,9 +26,6 @@ module Style
       class HashTransformKeys < Base
         include HashTransformMethod
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.5
 
         # @!method on_bad_each_with_object(node)
         def_node_matcher :on_bad_each_with_object, <<~PATTERN

lib/rubocop/cop/style/hash_transform_values.rb

@@ -26,9 +26,6 @@ module Style
       class HashTransformValues < Base
         include HashTransformMethod
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.4
 
         # @!method on_bad_each_with_object(node)
         def_node_matcher :on_bad_each_with_object, <<~PATTERN

lib/rubocop/cop/style/numeric_predicate.rb

@@ -82,7 +82,7 @@ def check(node)
               predicate(node)
             end
 
-          return unless numeric && operator && replacement_supported?(operator)
+          return unless numeric && operator
 
           [numeric, replacement(numeric, operator)]
         end
@@ -107,14 +107,6 @@ def require_parentheses?(node)
           node.send_type? && node.binary_operation? && !node.parenthesized?
         end
 
-        def replacement_supported?(operator)
-          if %i[> <].include?(operator)
-            target_ruby_version >= 2.3
-          else
-            true
-          end
-        end
-
         def invert
           lambda do |comparison, numeric|
             comparison = { :> => :<, :< => :> }[comparison] || comparison

lib/rubocop/cop/style/redundant_begin.rb

@@ -81,7 +81,6 @@ def on_def(node)
         alias on_defs on_def
 
         def on_block(node)
-          return if target_ruby_version < 2.5
           return if node.send_node.lambda_literal?
           return if node.braces?
           return unless node.body&.kwbegin_type?

lib/rubocop/cop/style/safe_navigation.rb

@@ -80,14 +80,11 @@ class SafeNavigation < Base
         include NilMethods
         include RangeHelp
         extend AutoCorrector
-        extend TargetRubyVersion
 
         MSG = 'Use safe navigation (`&.`) instead of checking if an object ' \
               'exists before calling the method.'
         LOGIC_JUMP_KEYWORDS = %i[break fail next raise return throw yield].freeze
 
-        minimum_target_ruby_version 2.3
-
         # if format: (if checked_variable body nil)
         # unless format: (if checked_variable nil body)
         # @!method modifier_if_safe_navigation_candidate(node)

lib/rubocop/cop/style/symbol_array.rb

@@ -34,9 +34,6 @@ class SymbolArray < Base
         include ConfigurableEnforcedStyle
         include PercentArray
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.0
 
         PERCENT_MSG = 'Use `%i` or `%I` for an array of symbols.'
         ARRAY_MSG = 'Use %<prefer>s for an array of symbols.'

lib/rubocop/cop/style/unpack_first.rb

@@ -19,9 +19,6 @@ module Style
       #
       class UnpackFirst < Base
         extend AutoCorrector
-        extend TargetRubyVersion
-
-        minimum_target_ruby_version 2.4
 
         MSG = 'Use `%<receiver>s.unpack1(%<format>s)` instead of ' \
               '`%<receiver>s.unpack(%<format>s)%<method>s`.'

lib/rubocop/cop/util.rb

@@ -159,7 +159,7 @@ def to_supported_styles(enforced_style)
       private
 
       def compatible_external_encoding_for?(src)
-        src = src.dup if RUBY_VERSION < '2.3' || RUBY_ENGINE == 'jruby'
+        src = src.dup if RUBY_ENGINE == 'jruby'
         src.force_encoding(Encoding.default_external).valid_encoding?
       end
     end

lib/rubocop/rspec/shared_contexts.rb

@@ -116,30 +116,6 @@ def source_range(range, buffer: source_buffer)
   end
 end
 
-RSpec.shared_context 'ruby 2.0', :ruby20 do
-  let(:ruby_version) { 2.0 }
-end
-
-RSpec.shared_context 'ruby 2.1', :ruby21 do
-  let(:ruby_version) { 2.1 }
-end
-
-RSpec.shared_context 'ruby 2.2', :ruby22 do
-  let(:ruby_version) { 2.2 }
-end
-
-RSpec.shared_context 'ruby 2.3', :ruby23 do
-  let(:ruby_version) { 2.3 }
-end
-
-RSpec.shared_context 'ruby 2.4', :ruby24 do
-  let(:ruby_version) { 2.4 }
-end
-
-RSpec.shared_context 'ruby 2.5', :ruby25 do
-  let(:ruby_version) { 2.5 }
-end
-
 RSpec.shared_context 'ruby 2.6', :ruby26 do
   let(:ruby_version) { 2.6 }
 end

spec/rubocop/cop/gemspec/required_ruby_version_spec.rb

@@ -72,24 +72,22 @@
     end
   end
 
-  context 'target ruby version > 2.6', :ruby26 do
-    it 'registers an offense when `required_ruby_version` is specified with >= and is higher than `TargetRubyVersion`' do
-      expect_offense(<<~RUBY, '/path/to/bar.gemspec')
-        Gem::Specification.new do |spec|
-          spec.required_ruby_version = '>= 2.7.0'
-                                       ^^^^^^^^^^ `required_ruby_version` and `TargetRubyVersion` (2.6, which may be specified in .rubocop.yml) should be equal.
-        end
-      RUBY
-    end
+  it 'registers an offense when `required_ruby_version` is specified with >= and is higher than `TargetRubyVersion`' do
+    expect_offense(<<~RUBY, '/path/to/bar.gemspec')
+      Gem::Specification.new do |spec|
+        spec.required_ruby_version = '>= 2.7.0'
+                                     ^^^^^^^^^^ `required_ruby_version` and `TargetRubyVersion` (2.6, which may be specified in .rubocop.yml) should be equal.
+      end
+    RUBY
+  end
 
-    it 'registers an offense when `required_ruby_version` is specified with ~> and is higher than `TargetRubyVersion`' do
-      expect_offense(<<~RUBY, '/path/to/bar.gemspec')
-        Gem::Specification.new do |spec|
-          spec.required_ruby_version = '~> 2.7.0'
-                                       ^^^^^^^^^^ `required_ruby_version` and `TargetRubyVersion` (2.6, which may be specified in .rubocop.yml) should be equal.
-        end
-      RUBY
-    end
+  it 'registers an offense when `required_ruby_version` is specified with ~> and is higher than `TargetRubyVersion`' do
+    expect_offense(<<~RUBY, '/path/to/bar.gemspec')
+      Gem::Specification.new do |spec|
+        spec.required_ruby_version = '~> 2.7.0'
+                                     ^^^^^^^^^^ `required_ruby_version` and `TargetRubyVersion` (2.6, which may be specified in .rubocop.yml) should be equal.
+      end
+    RUBY
   end
 
   # rubocop:disable RSpec/RepeatedExampleGroupDescription

spec/rubocop/cop/layout/space_around_operators_spec.rb

@@ -12,7 +12,7 @@
         }
       )
   end
-  let(:target_ruby_version) { 2.5 }
+  let(:target_ruby_version) { 2.6 }
   let(:hash_style) { 'key' }
   let(:allow_for_alignment) { true }
   let(:exponent_operator_style) { nil }

spec/rubocop/cop/lint/ambiguous_range_spec.rb

@@ -86,7 +86,7 @@
         RUBY
       end
 
-      it 'can handle an endless range', :ruby26 do
+      it 'can handle an endless range' do
         expect_offense(<<~RUBY)
           x || 1#{operator}
           ^^^^^^ Wrap complex range boundaries with parentheses to avoid ambiguity.

spec/rubocop/cop/lint/deprecated_constants_spec.rb

@@ -51,25 +51,15 @@
     RUBY
   end
 
-  context 'Ruby <= 2.5', :ruby25 do
-    it 'does not register an offense when using `Net::HTTPServerException`' do
-      expect_no_offenses(<<~RUBY)
-        Net::HTTPServerException
-      RUBY
-    end
-  end
-
-  context 'Ruby >= 2.6', :ruby26 do
-    it 'registers and corrects an offense when using `Net::HTTPServerException`' do
-      expect_offense(<<~RUBY)
-        Net::HTTPServerException
-        ^^^^^^^^^^^^^^^^^^^^^^^^ Use `Net::HTTPClientException` instead of `Net::HTTPServerException`, deprecated since Ruby 2.6.
-      RUBY
+  it 'registers and corrects an offense when using `Net::HTTPServerException`' do
+    expect_offense(<<~RUBY)
+      Net::HTTPServerException
+      ^^^^^^^^^^^^^^^^^^^^^^^^ Use `Net::HTTPClientException` instead of `Net::HTTPServerException`, deprecated since Ruby 2.6.
+    RUBY
 
-      expect_correction(<<~RUBY)
-        Net::HTTPClientException
-      RUBY
-    end
+    expect_correction(<<~RUBY)
+      Net::HTTPClientException
+    RUBY
   end
 
   context 'Ruby <= 2.7', :ruby27 do

spec/rubocop/cop/lint/duplicate_hash_key_spec.rb

@@ -63,9 +63,7 @@
   it_behaves_like 'duplicated literal key', 'false'
   it_behaves_like 'duplicated literal key', 'nil'
   it_behaves_like 'duplicated literal key', "'str'"
-  context 'target ruby version >= 2.6', :ruby26 do
-    it_behaves_like 'duplicated literal key', '(42..)'
-  end
+  it_behaves_like 'duplicated literal key', '(42..)'
 
   shared_examples 'duplicated non literal key' do |key|
     it "does not register an offense for duplicated `#{key}` hash keys" do