Remove unused conditions

Author: ydakuka

lib/rubocop/cop/rspec/discarded_matcher.rb

@@ -55,50 +55,21 @@ def on_block(node) # rubocop:disable InternalAffairs/NumblockHandler
         def check_discarded_matcher(send_node, node)
           return unless matcher_call?(send_node)
           return unless inside_example?(node)
-          return unless example_with_expectation?(node)
 
           target = find_outermost_chain(node)
           return unless void_value?(target)
 
           add_offense(target, message: format(MSG, method: node.method_name))
         end
 
-        def example_with_expectation?(node)
-          example_node =
-            node.each_ancestor(:block).find { |ancestor| example?(ancestor) }
-
-          example_node && includes_expectation?(example_node)
-        end
-
         def void_value?(node)
           case node.parent.type
           when :begin
             true
           when :block
             example?(node.parent)
-          when :if
-            void_value_in_branch?(node, node.parent)
-          when :and, :or
-            void_in_logical_operator?(node, node.parent)
           when :when, :case
-            void_in_case_branch?(node, node.parent)
-          end
-        end
-
-        def void_value_in_branch?(node, parent)
-          (parent.if_branch == node || parent.else_branch == node) &&
-            void_value?(parent)
-        end
-
-        def void_in_logical_operator?(node, parent)
-          parent.rhs == node && void_value?(parent)
-        end
-
-        def void_in_case_branch?(node, parent)
-          if parent.when_type?
-            parent.body == node && void_value?(parent.parent)
-          else
-            parent.else_branch == node && void_value?(parent)
+            void_value?(node.parent)
           end
         end
 

spec/rubocop/cop/rspec/discarded_matcher_spec.rb

@@ -158,17 +158,17 @@
     RUBY
   end
 
-  it 'registers an offense for `change` in both `if` and `else` branches' do
-    expect_offense(<<~RUBY)
+  it 'does not register for `change` in `if` and `else` branches' do
+    expect_no_offenses(<<~RUBY)
       specify do
-        expect { result }.to change { obj.foo }.from(1).to(2)
-        if condition
-          change { obj.bar }.from(3).to(4)
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The result of `change` is not used. Did you mean to chain it with `.and`?
-        else
-          change { obj.baz }.from(5).to(6)
-          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The result of `change` is not used. Did you mean to chain it with `.and`?
-        end
+        change_temp =
+          if condition
+            change { obj.bar }.from(3).to(4)
+          else
+            change { obj.baz }.from(5).to(6)
+          end
+
+        expect { result }.to change_temp
       end
     RUBY
   end
@@ -183,6 +183,18 @@
     RUBY
   end
 
+  it 'does not register an offense for `change` in non-void `if` and `else` branches' do
+    expect_no_offenses(<<~RUBY)
+      specify do
+        result = if condition
+                   expect { result }.to change { obj.foo }.from(1).to(2)
+                 else
+                   expect { result }.to change { obj.foo }.from(3).to(4)
+                 end
+      end
+    RUBY
+  end
+
   it 'registers an offense for `change` in a `case` else branch' do
     expect_offense(<<~RUBY)
       specify do