Merge pull request #1985 from rubocop/revert-unwanted-change

Revert an change that would conceal unintentional RSpec syntax
rubocop · Oct 26, 2024 · 6584b4a · 6584b4a
2 parents 530af44 + 6cbe423
commit 6584b4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - 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])
+- Add support for `and` and `or` compound matchers to `RSpec/ChangeByZero` cop. ([@ydah])
 
 ## 3.1.0 (2024-10-01)
 

diff --git a/lib/rubocop/cop/rspec/change_by_zero.rb b/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)