Merge branch 'master' into test_and_deprecate_top_level_group_mixin_method

Author: bquorning

CHANGELOG.md

@@ -2,10 +2,13 @@
 
 ## Master (Unreleased)
 
+- Deprecate `top_level_group?` method from `TopLevelGroup` mixin as all of its callers were intentionally removed from `Rubocop/RSpec`. ([@corsonknowles])
+
+## 3.2.0 (2024-10-26)
+
 - Fix `RSpec/VoidExpect` to only operate inside an example block. ([@corsonknowles])
 - Change `RSpec/ContextWording` cop to always report an offense when both `Prefixes` and `AllowedPatterns` are empty. ([@ydah])
-- Fix an error for `RSpec/ChangeByZero` when `change (...) .by (0)` and `change (...)`, concatenated with `and` and `or`. ([@ydah])
-- Deprecate `top_level_group?` method from `TopLevelGroup` mixin as all of its callers were intentionally removed from `Rubocop/RSpec`. ([@corsonknowles])
+- Add support for `and` and `or` compound matchers to `RSpec/ChangeByZero` cop. ([@ydah])
 
 ## 3.1.0 (2024-10-01)
 

lib/rubocop/cop/rspec/change_by_zero.rb

@@ -118,11 +118,8 @@ def register_offense(node, change_node)
         # rubocop:enable Metrics/MethodLength
 
         def compound_expectations?(node)
-          if node.parent.send_type?
+          node.parent.send_type? &&
             %i[and or & |].include?(node.parent.method_name)
-          else
-            node.parent.and_type? || node.parent.or_type?
-          end
         end
 
         def message(change_node)

lib/rubocop/cop/rspec/mixin/top_level_group.rb

@@ -10,6 +10,7 @@ module TopLevelGroup
         DEPRECATED_MODULE_METHOD_WARNING =
           'top_level_group? is deprecated and will be ' \
           'removed in the next major version of rubocop_rspec.'
+
         def on_new_investigation
           super
 

lib/rubocop/rspec/version.rb

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