rubocop-rspec 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b642c03d2fb24a8ac19e4e9ea60b7db9267550533be56cf6bb01b79724f7ec5f
-  data.tar.gz: 560dcc8a649c9556ea38021addb497c188eeb794432e307c13203bfe0d8d3d56
+  metadata.gz: a04549578a5df31cc51ccb63edef6de85bb5a02365f4004a916307df9b192d94
+  data.tar.gz: 4fc0209d17164239f1e86b32da80b665ef597cb95fd8d2b71dd822e05c0f1c9b
 SHA512:
-  metadata.gz: 58f1eeb3b7a5c23629f76b87a4d1f66f1654bede0b59a4b8f9d7636f78d845850bf7518d87fac5a6daea2dda7bd13f844c59954ef231ce99a7cf310816891009
-  data.tar.gz: 4646cb7db9590720e985fa24b7cec2908af6b0a5c4ae61b882587f189f95b705dbf8f0272d7d30f2d0af569e4ec8d2cee9a20ba8ada819c3948c6a29dd6b3962
+  metadata.gz: d0436f1c4ae1685ce24163a3a46ac70a157afbb438ca556f8e63f1b7b6f8280fcf8dfa2fcb4c0e88e408d5b3857fa129e6ddbbae1e75ebdfc5c3dc89dabbc482
+  data.tar.gz: aff4399bc8a47869e4e2e3e183933bf768ca09d84973c627b13650686c65844beb8db333ecda4341a66ac2c29c928cc30b374d946cc43c029acd3c62ec7fce03

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Master (Unreleased)
 
+## 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 +939,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/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.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 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-03 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