rubocop-rspec 2.14.0 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fdb82e2eec960744c6f4960acada2a37cb2fb1bc3a1159b2fc444795c11448e
-  data.tar.gz: 8d5945bf3e9e839b84067fc38c68663b9b43394ee467421b152385cb5d0c111e
+  metadata.gz: bbd70ea9708a7d87e0a1307234e3ac5cc37cc6197e6b1cc72487342b772ec6f1
+  data.tar.gz: 0c50303e8a0d4218508c51e778d5cb6633b54fe6f823951ea5f8df68d162dfda
 SHA512:
-  metadata.gz: 320019459649ac0cb26c13496564af8c5c442caaa3a9e2bbee7959954a8ee6fd17cfcd70d0031012197db01e6b32b38b27fe9ab634d0b69a771884753500a244
-  data.tar.gz: cfa3023ab42ef3ce54160a11d5fcbdd02c6106ef52a631e2fd301b644b9659f0202224f03ac54061fe5135e8905c758b9ae4c790d1d527ff0fb28e020bda046a
+  metadata.gz: 2e1a6e55fb7aeef036448fe57f03b2d80b796e6971fbd22cd63db496e61b1e211a64e89e987cccc74f5124746713581fb621c805d458f7ff273d436432599483
+  data.tar.gz: 76655025092f103fbd6ca3eda6d466236a8a9857f207e11bc3f8e51c38238367346971c4a0f3feeca6b9069a53fa48bf8281d5dff61f68c6562edce4405a10f0

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Master (Unreleased)
 
+## 2.14.2 (2022-10-25)
+
+- Fix an incorrect autocorrect for `FactoryBot/ConsistentParenthesesStyle` with `omit_parentheses` option when method name and first argument are not on same line. ([@ydah])
+- Fix autocorrection loop in `RSpec/ExampleWording` for insufficient example wording. ([@pirj])
+- Fix `RSpec/SortMetadata` not to reorder arguments of `include_`/`it_behaves_like`. ([@pirj])
+- Fix a false positive for `RSpec/NoExpectationExample` when allowed pattern methods with arguments. ([@ydah])
+- Change `RSpec/FilePath` so that it only checks suffix when path is under spec/routing or type is defined as routing. ([@r7kamura])
+
+## 2.14.1 (2022-10-24)
+
+- Fix an error for `RSpec/Rails/InferredSpecType` with redundant type before other Hash metadata. ([@ydah])
+
 ## 2.14.0 (2022-10-23)
 
 - Add `require_implicit` style to `RSpec/ImplicitSubject`. ([@r7kamura])
@@ -16,7 +28,7 @@
 - Update `config/default.yml` removing deprecated option to make the config correctable by users. ([@ignaciovillaverde])
 - Do not attempt to auto-correct example groups with `include_examples` in `RSpec/LetBeforeExamples`. ([@pirj])
 - Add new `RSpec/SortMetadata` cop. ([@leoarnold])
-- Add support for subject! method to `RSpec/SubjectDeclaration`. ([@ydah][])
+- Add support for subject! method to `RSpec/SubjectDeclaration`. ([@ydah])
 
 ## 2.13.2 (2022-09-23)
 

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

@@ -68,20 +68,15 @@ module RuboCop
               add_wording_offense(description_node, MSG_SHOULD)
             elsif message.match?(IT_PREFIX)
               add_wording_offense(description_node, MSG_IT)
-            else
-              check_and_handle_insufficient_examples(description_node)
+            elsif insufficient_docstring?(description_node)
+              add_offense(docstring(description_node),
+                          message: MSG_INSUFFICIENT_DESCRIPTION)
             end
           end
         end
 
         private
 
-        def check_and_handle_insufficient_examples(description)
-          if insufficient_examples.include?(preprocess(text(description)))
-            add_wording_offense(description, MSG_INSUFFICIENT_DESCRIPTION)
-          end
-        end
-
         def add_wording_offense(node, message)
           docstring = docstring(node)
 
@@ -137,6 +132,10 @@ module RuboCop
           cop_config.fetch('IgnoredWords', [])
         end
 
+        def insufficient_docstring?(description_node)
+          insufficient_examples.include?(preprocess(text(description_node)))
+        end
+
         def insufficient_examples
           examples = cop_config.fetch('DisallowedExamples', [])
           examples.map! { |example| preprocess(example) }

data/lib/rubocop/cop/rspec/factory_bot/consistent_parentheses_style.rb

@@ -30,6 +30,16 @@ module RuboCop
         #   create :login
         #   create :login
         #
+        #   # also good
+        #   # when method name and first argument are not on same line
+        #   create(
+        #     :user
+        #   )
+        #   build(
+        #     :user,
+        #     name: 'foo'
+        #   )
+        #
         class ConsistentParenthesesStyle < Base
           extend AutoCorrector
           include ConfigurableEnforcedStyle
@@ -66,6 +76,7 @@ module RuboCop
 
           def process_with_parentheses(node)
             return unless style == :omit_parentheses
+            return unless same_line?(node, node.first_argument)
 
             add_offense(node.loc.selector,
                         message: MSG_OMIT_PARENS) do |corrector|

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

@@ -76,8 +76,6 @@ module RuboCop
           return unless top_level_groups.one?
 
           example_group(node) do |send_node, example_group, arguments|
-            next if routing_spec?(arguments)
-
             ensure_correct_file_path(send_node, example_group, arguments)
           end
         end
@@ -85,7 +83,7 @@ module RuboCop
         private
 
         def ensure_correct_file_path(send_node, example_group, arguments)
-          pattern = pattern_for(example_group, arguments.first)
+          pattern = pattern_for(example_group, arguments)
           return if filename_ends_with?(pattern)
 
           # For the suffix shown in the offense message, modify the regular
@@ -97,11 +95,13 @@ module RuboCop
         end
 
         def routing_spec?(args)
-          args.any?(&method(:routing_metadata?))
+          args.any?(&method(:routing_metadata?)) || routing_spec_path?
         end
 
-        def pattern_for(example_group, method_name)
-          if spec_suffix_only? || !example_group.const_type?
+        def pattern_for(example_group, arguments)
+          method_name = arguments.first
+          if spec_suffix_only? || !example_group.const_type? ||
+              routing_spec?(arguments)
             return pattern_for_spec_suffix_only
           end
 
@@ -149,8 +149,7 @@ module RuboCop
         end
 
         def filename_ends_with?(pattern)
-          filename = File.expand_path(processed_source.buffer.name)
-          filename.match?("#{pattern}$")
+          expanded_file_path.match?("#{pattern}$")
         end
 
         def relevant_rubocop_rspec_file?(_file)
@@ -160,6 +159,14 @@ module RuboCop
         def spec_suffix_only?
           cop_config['SpecSuffixOnly']
         end
+
+        def routing_spec_path?
+          expanded_file_path.include?('spec/routing/')
+        end
+
+        def expanded_file_path
+          File.expand_path(processed_source.buffer.name)
+        end
       end
     end
   end

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

@@ -77,7 +77,7 @@ module RuboCop
         def_node_search :includes_expectation?, <<~PATTERN
           {
             #{send_pattern('#Expectations.all')}
-            (send nil? `#matches_allowed_pattern?)
+            (send nil? `#matches_allowed_pattern? ...)
           }
         PATTERN
 

data/lib/rubocop/cop/rspec/rails/inferred_spec_type.rb

@@ -89,11 +89,21 @@ module RuboCop
           # @param [RuboCop::AST::Corrector] corrector
           # @param [RuboCop::AST::Node] node
           def autocorrect(corrector, node)
-            corrector.remove(
-              node.location.expression.with(
-                begin_pos: node.left_sibling.location.expression.end_pos
+            corrector.remove(remove_range(node))
+          end
+
+          # @param [RuboCop::AST::Node] node
+          # @return [Parser::Source::Range]
+          def remove_range(node)
+            if node.left_sibling
+              node.loc.expression.with(
+                begin_pos: node.left_sibling.loc.expression.end_pos
               )
-            )
+            elsif node.right_sibling
+              node.loc.expression.with(
+                end_pos: node.right_sibling.loc.expression.begin_pos
+              )
+            end
           end
 
           # @param [RuboCop::AST::PairNode] node

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

@@ -26,8 +26,7 @@ module RuboCop
         def_node_matcher :rspec_metadata, <<~PATTERN
           (block
             (send
-              #rspec? {#Examples.all #ExampleGroups.all #SharedGroups.all #Hooks.all #Includes.all}
-              _ ${send str sym}* (hash $...)?)
+              #rspec? {#Examples.all #ExampleGroups.all #SharedGroups.all #Hooks.all} _ ${send str sym}* (hash $...)?)
             ...)
         PATTERN
 

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.14.0'
+      STRING = '2.14.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.2
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-23 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop