rubocop-rspec 2.4.0 → 2.8.0

data/lib/rubocop/cop/rspec/variable_definition.rb

@@ -23,6 +23,7 @@ module RuboCop
       #   subject('user') { create_user }
       #   let('user_name') { 'Adam' }
       class VariableDefinition < Base
+        extend AutoCorrector
         include ConfigurableEnforcedStyle
         include Variable
 
@@ -30,14 +31,30 @@ module RuboCop
 
         def on_send(node)
           variable_definition?(node) do |variable|
-            if style_violation?(variable)
-              add_offense(variable, message: format(MSG, style: style))
+            next unless style_violation?(variable)
+
+            add_offense(
+              variable,
+              message: format(MSG, style: style)
+            ) do |corrector|
+              corrector.replace(variable, correct_variable(variable))
             end
           end
         end
 
         private
 
+        def correct_variable(variable)
+          case variable.type
+          when :dsym
+            variable.source[1..-1]
+          when :sym
+            variable.value.to_s.inspect
+          else
+            variable.value.to_sym.inspect
+          end
+        end
+
         def style_violation?(variable)
           style == :symbols && string?(variable) ||
             style == :strings && symbol?(variable)

data/lib/rubocop/cop/rspec/yield.rb

@@ -10,7 +10,7 @@ module RuboCop
       #   allow(foo).to receive(:bar) { |&block| block.call(1) }
       #
       #   # good
-      #   expect(foo).to be(:bar).and_yield(1)
+      #   expect(foo).to receive(:bar).and_yield(1)
       class Yield < Base
         extend AutoCorrector
         include RangeHelp

data/lib/rubocop/cop/rspec_cops.rb

@@ -7,6 +7,7 @@ require_relative 'rspec/capybara/visibility_matcher'
 require_relative 'rspec/factory_bot/attribute_defined_statically'
 require_relative 'rspec/factory_bot/create_list'
 require_relative 'rspec/factory_bot/factory_class_name'
+require_relative 'rspec/factory_bot/syntax_methods'
 
 require_relative 'rspec/rails/avoid_setup_hook'
 begin
@@ -40,6 +41,7 @@ require_relative 'rspec/empty_line_after_subject'
 require_relative 'rspec/example_length'
 require_relative 'rspec/example_without_description'
 require_relative 'rspec/example_wording'
+require_relative 'rspec/excessive_docstring_spacing'
 require_relative 'rspec/expect_actual'
 require_relative 'rspec/expect_change'
 require_relative 'rspec/expect_in_hook'
@@ -88,6 +90,7 @@ require_relative 'rspec/shared_context'
 require_relative 'rspec/shared_examples'
 require_relative 'rspec/single_argument_message_chain'
 require_relative 'rspec/stubbed_mock'
+require_relative 'rspec/subject_declaration'
 require_relative 'rspec/subject_stub'
 require_relative 'rspec/unspecified_exception'
 require_relative 'rspec/variable_definition'

data/lib/rubocop/rspec/align_let_brace.rb

@@ -5,6 +5,7 @@ module RuboCop
     # Shared behavior for aligning braces for single line lets
     class AlignLetBrace
       include RuboCop::RSpec::Language
+      include RuboCop::Cop::Util
 
       def initialize(root, token)
         @root  = root
@@ -34,7 +35,7 @@ module RuboCop
       def let_group_for(let)
         adjacent_let_chunks.detect do |chunk|
           chunk.any? do |member|
-            member == let && member.loc.line == let.loc.line
+            member == let && same_line?(member, let)
           end
         end
       end

data/lib/rubocop/rspec/config_formatter.rb

@@ -7,7 +7,8 @@ module RuboCop
     # Builds a YAML config file from two config hashes
     class ConfigFormatter
       EXTENSION_ROOT_DEPARTMENT = %r{^(RSpec/)}.freeze
-      STYLE_GUIDE_BASE_URL = 'https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/'
+      SUBDEPARTMENTS = %(RSpec/Capybara RSpec/FactoryBot RSpec/Rails)
+      COP_DOC_BASE_URL = 'https://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/'
 
       def initialize(config, descriptions)
         @config       = config
@@ -24,9 +25,10 @@ module RuboCop
 
       def unified_config
         cops.each_with_object(config.dup) do |cop, unified|
-          unified[cop] = config.fetch(cop)
-            .merge(descriptions.fetch(cop))
-            .merge('StyleGuide' => STYLE_GUIDE_BASE_URL + cop.sub('RSpec/', ''))
+          next if SUBDEPARTMENTS.include?(cop)
+
+          unified[cop].merge!(descriptions.fetch(cop))
+          unified[cop]['Reference'] = COP_DOC_BASE_URL + cop.sub('RSpec/', '')
         end
       end
 

data/lib/rubocop/rspec/factory_bot/language.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module RSpec
+    module FactoryBot
+      # Contains node matchers for common FactoryBot DSL.
+      module Language
+        extend RuboCop::NodePattern::Macros
+
+        # @!method factory_bot?(node)
+        def_node_matcher :factory_bot?, <<~PATTERN
+          (const {nil? cbase} {:FactoryGirl :FactoryBot})
+        PATTERN
+      end
+    end
+  end
+end

data/lib/rubocop/rspec/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module RSpec
     # Version information for the RSpec RuboCop plugin.
     module Version
-      STRING = '2.4.0'
+      STRING = '2.8.0'
     end
   end
 end

data/lib/rubocop-rspec.rb

@@ -12,11 +12,14 @@ require_relative 'rubocop/rspec/wording'
 require_relative 'rubocop/rspec/language/node_pattern'
 require_relative 'rubocop/rspec/language'
 
+require_relative 'rubocop/rspec/factory_bot/language'
+
 require_relative 'rubocop/cop/rspec/mixin/top_level_group'
 require_relative 'rubocop/cop/rspec/mixin/variable'
 require_relative 'rubocop/cop/rspec/mixin/final_end_location'
 require_relative 'rubocop/cop/rspec/mixin/comments_help'
 require_relative 'rubocop/cop/rspec/mixin/empty_line_separation'
+require_relative 'rubocop/cop/rspec/mixin/inside_example_group'
 
 require_relative 'rubocop/rspec/concept'
 require_relative 'rubocop/rspec/example_group'
@@ -31,8 +34,8 @@ RuboCop::RSpec::Inject.defaults!
 
 require_relative 'rubocop/cop/rspec_cops'
 
-# We have to register our autocorrect incompatibilies in RuboCop's cops as well
-# so we do not hit infinite loops
+# We have to register our autocorrect incompatibilities in RuboCop's cops
+# as well so we do not hit infinite loops
 
 module RuboCop
   module Cop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.8.0
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,28 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-ast
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -97,19 +83,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +158,7 @@ files:
 - lib/rubocop/cop/rspec/example_length.rb
 - lib/rubocop/cop/rspec/example_without_description.rb
 - lib/rubocop/cop/rspec/example_wording.rb
+- lib/rubocop/cop/rspec/excessive_docstring_spacing.rb
 - lib/rubocop/cop/rspec/expect_actual.rb
 - lib/rubocop/cop/rspec/expect_change.rb
 - lib/rubocop/cop/rspec/expect_in_hook.rb
@@ -179,6 +166,7 @@ files:
 - lib/rubocop/cop/rspec/factory_bot/attribute_defined_statically.rb
 - lib/rubocop/cop/rspec/factory_bot/create_list.rb
 - lib/rubocop/cop/rspec/factory_bot/factory_class_name.rb
+- lib/rubocop/cop/rspec/factory_bot/syntax_methods.rb
 - lib/rubocop/cop/rspec/file_path.rb
 - lib/rubocop/cop/rspec/focus.rb
 - lib/rubocop/cop/rspec/hook_argument.rb
@@ -202,6 +190,7 @@ files:
 - lib/rubocop/cop/rspec/mixin/comments_help.rb
 - lib/rubocop/cop/rspec/mixin/empty_line_separation.rb
 - lib/rubocop/cop/rspec/mixin/final_end_location.rb
+- lib/rubocop/cop/rspec/mixin/inside_example_group.rb
 - lib/rubocop/cop/rspec/mixin/top_level_group.rb
 - lib/rubocop/cop/rspec/mixin/variable.rb
 - lib/rubocop/cop/rspec/multiple_describes.rb
@@ -230,6 +219,7 @@ files:
 - lib/rubocop/cop/rspec/shared_examples.rb
 - lib/rubocop/cop/rspec/single_argument_message_chain.rb
 - lib/rubocop/cop/rspec/stubbed_mock.rb
+- lib/rubocop/cop/rspec/subject_declaration.rb
 - lib/rubocop/cop/rspec/subject_stub.rb
 - lib/rubocop/cop/rspec/unspecified_exception.rb
 - lib/rubocop/cop/rspec/variable_definition.rb
@@ -246,6 +236,7 @@ files:
 - lib/rubocop/rspec/example.rb
 - lib/rubocop/rspec/example_group.rb
 - lib/rubocop/rspec/factory_bot.rb
+- lib/rubocop/rspec/factory_bot/language.rb
 - lib/rubocop/rspec/hook.rb
 - lib/rubocop/rspec/inject.rb
 - lib/rubocop/rspec/language.rb
@@ -259,6 +250,7 @@ licenses:
 metadata:
   changelog_uri: https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md
   documentation_uri: https://docs.rubocop.org/rubocop-rspec/
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -274,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.3.1
 signing_key:
 specification_version: 4
 summary: Code style checking for RSpec files