rubocop-rspec 3.0.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b642c03d2fb24a8ac19e4e9ea60b7db9267550533be56cf6bb01b79724f7ec5f
-  data.tar.gz: 560dcc8a649c9556ea38021addb497c188eeb794432e307c13203bfe0d8d3d56
+  metadata.gz: cc86eb0b71fda4e28260323fd53987730be73074de0011d50c43429f8de531e0
+  data.tar.gz: 2b65f66de5fb68f06f752227a5c2376a4680a1984b5f21880b35325031160d24
 SHA512:
-  metadata.gz: 58f1eeb3b7a5c23629f76b87a4d1f66f1654bede0b59a4b8f9d7636f78d845850bf7518d87fac5a6daea2dda7bd13f844c59954ef231ce99a7cf310816891009
-  data.tar.gz: 4646cb7db9590720e985fa24b7cec2908af6b0a5c4ae61b882587f189f95b705dbf8f0272d7d30f2d0af569e4ec8d2cee9a20ba8ada819c3948c6a29dd6b3962
+  metadata.gz: 835a6f93ad56ee749027bfcfa9f717a6c92ec5ab3fbbd2c0e47a5ddcad89de0f80381d06635e82d7c6c55f7d22d0b3a39dd514e02ae5dc3b840e5023070485da
+  data.tar.gz: '093d0cb926c5e3c5d2f0aaab4b56f2e6855dca2dd40200590cb4629dbd448450bca32c0c3c7e40102518f92b30574481f6a06c69e738e776bb5ca268be2649ce'

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Master (Unreleased)
 
+## 3.0.3 (2024-07-12)
+
+- Add support for Unicode RIGHT SINGLE QUOTATION MARK in `RSpec/ExampleWording`. ([@jdufresne])
+- Suppress deprecation warning for `RSpec/MultipleExpectations`, `RSpec/MultipleMemoizedHelpers`, and `RSpec/NestedGroups` cops. ([@koic])
+
+## 3.0.2 (2024-07-02)
+
+- Fix wrong autocorrect for `RSpec/ScatteredSetup` when hook contains heredoc. ([@earlopain])
+- Fix false negative for `RSpec/PredicateMatcher` when expectation contains custom failure message. ([@earlopain])
+- Facilitate the 3.0 upgrade flow with proper extracted cop messages. ([@jeppester])
+
 ## 3.0.1 (2024-06-11)
 
 - Bump RuboCop requirement to +1.61. ([@ydah])
@@ -933,6 +944,7 @@ Compatibility release so users can upgrade RuboCop to 0.51.0. No new features.
 [@jaredmoody]: https://github.com/jaredmoody
 [@jdufresne]: https://github.com/jdufresne
 [@jeffreyc]: https://github.com/jeffreyc
+[@jeppester]: https://github.com/jeppester
 [@jessieay]: https://github.com/jessieay
 [@jfragoulis]: https://github.com/jfragoulis
 [@johnny-miyake]: https://github.com/johnny-miyake

data/README.md

@@ -7,6 +7,15 @@
 [RSpec](https://rspec.info/)-specific analysis for your projects, as an extension to
 [RuboCop](https://github.com/rubocop/rubocop).
 
+- [Installation](#installation)
+  - [Upgrading to RuboCop RSpec v3.x](#upgrading-to-rubocop-rspec-v3x)
+  - [Upgrading to RuboCop RSpec v2.x](#upgrading-to-rubocop-rspec-v2x)
+- [Usage](#usage)
+- [Documentation](#documentation)
+- [The Cops](#the-cops)
+- [Contributing](#contributing)
+- [License](#license)
+
 ## Installation
 
 Just install the `rubocop-rspec` gem
@@ -21,6 +30,10 @@ or if you use bundler put this in your `Gemfile`
 gem 'rubocop-rspec', require: false
 ```
 
+### Upgrading to RuboCop RSpec v3.x
+
+Read all the details in our [Upgrade to Version 3.x](https://docs.rubocop.org/rubocop-rspec/3.0/upgrade_to_version_3.html) document.
+
 ### Upgrading to RuboCop RSpec v2.x
 
 Read all the details in our [Upgrade to Version 2.x](https://docs.rubocop.org/rubocop-rspec/2.0/upgrade_to_version_2.html) document.

data/config/obsoletion.yml

@@ -13,28 +13,6 @@ changed_parameters:
     alternative: AllowedPatterns
     severity: warning
 
-renamed:
-  RSpec/Capybara/CurrentPathExpectation: Capybara/CurrentPathExpectation
-  RSpec/Capybara/MatchStyle: Capybara/MatchStyle
-  RSpec/Capybara/NegationMatcher: Capybara/NegationMatcher
-  RSpec/Capybara/SpecificActions: Capybara/SpecificActions
-  RSpec/Capybara/SpecificFinders: Capybara/SpecificFinders
-  RSpec/Capybara/SpecificMatcher: Capybara/SpecificMatcher
-  RSpec/Capybara/VisibilityMatcher: Capybara/VisibilityMatcher
-  RSpec/FactoryBot/AttributeDefinedStatically: FactoryBot/AttributeDefinedStatically
-  RSpec/FactoryBot/ConsistentParenthesesStyle: FactoryBot/ConsistentParenthesesStyle
-  RSpec/FactoryBot/CreateList: FactoryBot/CreateList
-  RSpec/FactoryBot/FactoryClassName: FactoryBot/FactoryClassName
-  RSpec/FactoryBot/FactoryNameStyle: FactoryBot/FactoryNameStyle
-  RSpec/FactoryBot/SyntaxMethods: FactoryBot/SyntaxMethods
-  RSpec/Rails/AvoidSetupHook: RSpecRails/AvoidSetupHook
-  RSpec/Rails/HaveHttpStatus: RSpecRails/HaveHttpStatus
-  RSpec/Rails/HttpStatus: RSpecRails/HttpStatus
-  RSpec/Rails/InferredSpecType: RSpecRails/InferredSpecType
-  RSpec/Rails/MinitestAssertions: RSpecRails/MinitestAssertions
-  RSpec/Rails/NegationBeValid: RSpecRails/NegationBeValid
-  RSpec/Rails/TravelAround: RSpecRails/TravelAround
-
 split:
   RSpec/FilePath:
     alternatives:
@@ -45,3 +23,8 @@ removed:
   RSpec/Capybara/FeatureMethods:
     reason: >
       this cop has migrated to `RSpec/Dialect`. Please use `RSpec/Dialect` instead
+
+extracted:
+  RSpec/Rails/*: rubocop-rspec_rails
+  RSpec/FactoryBot/*: rubocop-factory_bot
+  RSpec/Capybara/*: rubocop-capybara

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

@@ -55,8 +55,8 @@ module RuboCop
         MSG_INSUFFICIENT_DESCRIPTION = 'Your example description is ' \
                                        'insufficient.'
 
-        SHOULD_PREFIX = /\Ashould(?:n't)?\b/i.freeze
-        WILL_PREFIX   = /\A(?:will|won't)\b/i.freeze
+        SHOULD_PREFIX = /\Ashould(?:n't|n’t)?\b/i.freeze
+        WILL_PREFIX   = /\A(?:will|won't|won’t)\b/i.freeze
         IT_PREFIX     = /\Ait /i.freeze
 
         # @!method it_description(node)

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

@@ -67,13 +67,13 @@ module RuboCop
       #   end
       #
       class MultipleExpectations < Base
-        include ConfigurableMax
-
         MSG = 'Example has too many expectations [%<total>d/%<max>d].'
 
         ANYTHING = ->(_node) { true }
         TRUE_NODE = lambda(&:true_type?)
 
+        exclude_limit 'Max'
+
         # @!method aggregate_failures?(node)
         def_node_matcher :aggregate_failures?, <<~PATTERN
           (block {

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

@@ -82,11 +82,12 @@ module RuboCop
       #   end
       #
       class MultipleMemoizedHelpers < Base
-        include ConfigurableMax
         include Variable
 
         MSG = 'Example group has too many memoized helpers [%<count>d/%<max>d]'
 
+        exclude_limit 'Max'
+
         def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
           return unless spec_group?(node)
 

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

@@ -92,7 +92,6 @@ module RuboCop
       #   end
       #
       class NestedGroups < Base
-        include ConfigurableMax
         include TopLevelGroup
 
         MSG = 'Maximum example group nesting exceeded [%<total>d/%<max>d].'
@@ -103,6 +102,8 @@ module RuboCop
           "Configuration key `#{DEPRECATED_MAX_KEY}` for #{cop_name} is " \
           'deprecated in favor of `Max`. Please use that instead.'
 
+        exclude_limit 'Max'
+
         def on_top_level_group(node)
           find_nested_example_groups(node) do |example_group, nesting|
             self.max = nesting

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

@@ -32,7 +32,7 @@ module RuboCop
               (block $(send !nil? #predicate? ...) ...)
               $(send !nil? #predicate? ...)})
             $#Runners.all
-            $#boolean_matcher?)
+            $#boolean_matcher? ...)
         PATTERN
 
         # @!method be_bool?(node)
@@ -183,8 +183,12 @@ module RuboCop
           (send
             (send nil? :expect $!nil?)
             #Runners.all
-            {$(send nil? #predicate_matcher_name? ...)
-              (block $(send nil? #predicate_matcher_name? ...) ...)})
+            {
+              $(send nil? #predicate_matcher_name? ...)
+              (block $(send nil? #predicate_matcher_name? ...) ...)
+            }
+            ...
+          )
         PATTERN
 
         # @!method predicate_matcher_block?(node)

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

@@ -23,6 +23,7 @@ module RuboCop
       #   end
       #
       class ScatteredSetup < Base
+        include FinalEndLocation
         include RangeHelp
         extend AutoCorrector
 
@@ -75,8 +76,13 @@ module RuboCop
         def autocorrect(corrector, first_occurrence, occurrence)
           return if first_occurrence == occurrence || !first_occurrence.body
 
+          # Take heredocs into account
+          body = occurrence.body&.source_range&.with(
+            end_pos: final_end_location(occurrence).begin_pos
+          )
+
           corrector.insert_after(first_occurrence.body,
-                                 "\n#{occurrence.body&.source}")
+                                 "\n#{body&.source}")
           corrector.remove(range_by_whole_lines(occurrence.source_range,
                                                 include_final_newline: true))
         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 = '3.0.1'
+      STRING = '3.0.3'
     end
   end
 end

data/lib/rubocop/rspec/wording.rb

@@ -4,10 +4,10 @@ module RuboCop
   module RSpec
     # RSpec example wording rewriter
     class Wording
-      SHOULDNT_PREFIX    = /\Ashould(?:n't| not)\b/i.freeze
+      SHOULDNT_PREFIX    = /\Ashould(?:n't|n’t| not)\b/i.freeze
       SHOULDNT_BE_PREFIX = /#{SHOULDNT_PREFIX} be\b/i.freeze
       WILL_NOT_PREFIX    = /\Awill not\b/i.freeze
-      WONT_PREFIX        = /\Awon't\b/i.freeze
+      WONT_PREFIX        = /\Awo(?:n't|n’t)\b/i.freeze
       ES_SUFFIX_PATTERN  = /(?:o|s|x|ch|sh|z)\z/i.freeze
       IES_SUFFIX_PATTERN = /[^aeou]y\z/i.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - John Backus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Code style checking for RSpec files