Gets rubocop working on modern rubocops and rubies.

Author: Sam Phippen

.rubocop.yml

@@ -43,3 +43,29 @@ PerlBackrefs:
     # We probably can refactor the backref out, but for now excluding it since
     # we can't use named matches in 1.8.7
     - lib/generators/rspec/scaffold/scaffold_generator.rb
+
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/EmptyExpression:
+  Enabled: false
+
+Layout/AlignHash:
+  Enabled: false
+

.rubocop_rspec_base.yml

@@ -22,7 +22,7 @@ CaseEquality:
   Enabled: false
 
 # Warns when the class is excessively long.
-ClassLength:
+Metrics/ClassLength:
   Max: 100
 
 CollectionMethods:
@@ -66,7 +66,7 @@ LineLength:
   Max: 100
 
 # Over time we'd like to get this down, but this is what we're at now.
-MethodLength:
+Metrics/MethodLength:
   Max: 15
 
 # Who cares what we call the argument for binary operator methods?
@@ -115,7 +115,10 @@ StringLiterals:
 Style/SpecialGlobalVars:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
 Style/TrailingCommaInArguments:
@@ -162,7 +165,10 @@ Style/IfUnlessModifier:
 Style/IfUnlessModifierOfIfUnless:
   Enabled: false
 
-Style/MethodMissing:
+Style/MethodMissingSuper:
+  Enabled: false
+
+Style/MissingRespondToMissing:
   Enabled: false
 
 Style/MixinUsage:
@@ -243,11 +249,6 @@ Style/StderrPuts:
 Style/TernaryParentheses:
   Enabled: false
 
-# This could likely be enabled, but it had a false positive on rspec-mocks
-# (suggested change was not behaviour preserving) so I don't trust it.
-Performance/HashEachMethods:
-  Enabled: false
-
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
@@ -307,3 +308,6 @@ Style/TrailingUnderscoreVariable:
 
 Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false

Gemfile

@@ -78,11 +78,7 @@ else
   gem "rubyzip", '>= 1.2.2'
 end
 
-if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.2.0'
-  # our current rubocop version doesn't support the json version required by Ruby 2.4
-  # our rails rubocop setup only supports 2.0 and 2.1
-  gem 'rubocop', "~> 0.23.0"
-end
+gem 'rubocop'
 
 custom_gemfile = File.expand_path("../Gemfile-custom", __FILE__)
 eval_gemfile custom_gemfile if File.exist?(custom_gemfile)

lib/generators/rspec/mailer/mailer_generator.rb

@@ -20,6 +20,7 @@ def generate_fixtures_files
 
       def generate_preview_files
         return unless RSpec::Rails::FeatureCheck.has_action_mailer_preview?
+
         template "preview.rb", File.join("spec/mailers/previews", class_path, "#{file_name}_preview.rb")
       end
     end

lib/generators/rspec/model/model_generator.rb

@@ -23,6 +23,7 @@ def create_model_spec
 
       def create_fixture_file
         return unless missing_fixture_replacement?
+
         template 'fixtures.yml', File.join('spec/fixtures', class_path, "#{(pluralize_table_names? ? plural_file_name : file_name)}.yml")
       end
 

lib/generators/rspec/request/request_generator.rb

@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class RequestGenerator < IntegrationGenerator
-      source_paths << File.expand_path("../../integration/templates", __FILE__)
+      source_paths << File.expand_path('../integration/templates', __dir__)
     end
   end
 end

lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -6,7 +6,7 @@ module Generators
     # @private
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
-      source_paths << File.expand_path("../../helper/templates", __FILE__)
+      source_paths << File.expand_path('../helper/templates', __dir__)
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
       class_option :orm, :desc => "ORM used to generate the controller"
@@ -74,12 +74,14 @@ def copy_view(view)
       # support for namespaced-resources
       def ns_file_name
         return file_name if ns_parts.empty?
+
         "#{ns_prefix.map(&:underscore).join('/')}_#{ns_suffix.singularize.underscore}"
       end
 
       # support for namespaced-resources
       def ns_table_name
         return table_name if ns_parts.empty?
+
         "#{ns_prefix.map(&:underscore).join('/')}/#{ns_suffix.tableize}"
       end
 

lib/rspec-rails.rb

@@ -39,6 +39,7 @@ class Railtie < ::Rails::Railtie
 
       def setup_preview_path(app)
         return unless supports_action_mailer_previews?(app.config)
+
         options = app.config.action_mailer
         config_default_preview_path(options) if config_preview_path?(options)
       end
@@ -57,6 +58,7 @@ def config_preview_path?(options)
 
       def config_default_preview_path(options)
         return unless options.preview_path.blank?
+
         options.preview_path = "#{::Rails.root}/spec/mailers/previews"
       end
 

lib/rspec/rails/adapters.rb

@@ -103,6 +103,7 @@ def assertion_instance
           assertion_modules.each do |mod|
             mod.public_instance_methods.each do |method|
               next if method == :method_missing || method == "method_missing"
+
               define_method(method.to_sym) do |*args, &block|
                 assertion_instance.send(method.to_sym, *args, &block)
               end

lib/rspec/rails/example/helper_example_group.rb

@@ -19,6 +19,7 @@ def determine_constant_from_test_name(_ignore)
         else
           def determine_default_helper_class(_ignore)
             return unless Module === described_class && !(Class === described_class)
+
             described_class
           end
         end

lib/rspec/rails/example/system_example_group.rb

@@ -49,7 +49,6 @@ def app
         begin
           require 'capybara'
           require 'action_dispatch/system_test_case'
-        # rubocop:disable Lint/HandleExceptions
         rescue LoadError => e
           # rubocop:enable Lint/HandleExceptions
           abort """

lib/rspec/rails/feature_check.rb

@@ -2,9 +2,7 @@ module RSpec
   module Rails
     # @private
     # Disable some cops until https://github.com/bbatsov/rubocop/issues/1310
-    # rubocop:disable Style/IndentationConsistency
     module FeatureCheck
-    # rubocop:disable Style/IndentationWidth
     module_function
       # rubocop:enable Style/IndentationWidth
 

lib/rspec/rails/matchers/active_job.rb

@@ -310,6 +310,7 @@ def have_been_enqueued
       # @private
       def check_active_job_adapter
         return if ::ActiveJob::QueueAdapters::TestAdapter === ::ActiveJob::Base.queue_adapter
+
         raise StandardError, "To use ActiveJob matchers set `ActiveJob::Base.queue_adapter = :test`"
       end
     end

lib/rspec/rails/matchers/base_matcher.rb

@@ -114,6 +114,7 @@ def self.underscore(camel_cased_word)
 
         def assert_ivars(*expected_ivars)
           return unless (expected_ivars - present_ivars).any?
+
           ivar_list = RSpec::Matchers::EnglishPhrasing.list(expected_ivars)
           raise "#{self.class.name} needs to supply#{ivar_list}"
         end

lib/rspec/rails/matchers/have_enqueued_mail.rb

@@ -6,7 +6,6 @@ module Rails
     module Matchers
       # Matcher class for `have_enqueued_mail`. Should not be instantiated directly.
       #
-      # rubocop: disable Style/ClassLength
       # @private
       # @see RSpec::Rails::Matchers#have_enqueued_mail
       class HaveEnqueuedMail < ActiveJob::HaveEnqueuedJob
@@ -33,6 +32,7 @@ def with(*args, &block)
 
         def matches?(block)
           raise ArgumentError, 'have_enqueued_mail and enqueue_mail only work with block arguments' unless block.respond_to?(:call)
+
           check_active_job_adapter
           super
         end
@@ -89,6 +89,7 @@ def yield_mail_args(block)
 
         def check_active_job_adapter
           return if ::ActiveJob::QueueAdapters::TestAdapter === ::ActiveJob::Base.queue_adapter
+
           raise StandardError, "To use HaveEnqueuedMail matcher set `ActiveJob::Base.queue_adapter = :test`"
         end
 

lib/rspec/rails/matchers/have_http_status.rb

@@ -59,6 +59,7 @@ def as_test_response(obj)
         #   `@invalid_response` is present, `nil` otherwise
         def invalid_response_type_message
           return unless @invalid_response
+
           "expected a response object, but an instance of " \
           "#{@invalid_response.class} was received"
         end
@@ -174,6 +175,7 @@ def failure_message_when_negated
           # @return [Symbol] representing the actual http numeric code
           def actual_status
             return unless actual
+
             @actual_status ||= compute_status_from(actual)
           end
 
@@ -254,6 +256,7 @@ def initialize(type)
             unless self.class.valid_statuses.include?(type)
               raise ArgumentError, "Invalid generic HTTP status: #{type.inspect}"
             end
+
             @expected = type
             @actual = nil
             @invalid_response = nil
@@ -374,6 +377,7 @@ def type_codes
       # @see https://github.com/rack/rack/blob/master/lib/rack/utils.rb `Rack::Utils::SYMBOL_TO_STATUS_CODE`
       def have_http_status(target)
         raise ArgumentError, "Invalid HTTP status: nil" unless target
+
         HaveHttpStatus.matcher_for_status(target)
       end
     end

lib/rspec/rails/matchers/have_rendered.rb

@@ -29,6 +29,7 @@ def matches?(*)
           def check_redirect
             response = @scope.response
             return unless response.respond_to?(:redirect?) && response.redirect?
+
             @redirect_is = @scope.send(:normalize_argument_to_redirection, response.location)
           end