assign value to a variable and return at the end.

[h-kataria]

Fixed exp_find_by_token method to return values correctly when finding token within an expression with mixed operators

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1660460

before

after

@gtanzillo @jrafanie please review

@dclarizio cc

[miq-bot]

Checked commit h-kataria@070d143 with ruby 2.3.3, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 4 offenses detected

spec/lib/miq_expression/subst_mixin_spec.rb

• ❗ - Line 17, Col 11 - Layout/AlignHash - Align the elements of a hash literal if they span more than one line.
• ❗ - Line 20, Col 16 - Layout/AlignHash - Align the elements of a hash literal if they span more than one line.
• ❗ - Line 25, Col 15 - Layout/MultilineHashBraceLayout - Closing hash brace must be on the same line as the last hash element when opening brace is on the same line as the first hash element.
• ❗ - Line 35, Col 11 - Layout/AlignHash - Align the elements of a hash literal if they span more than one line.

[h-kataria]

@bdunne made requested changes

[gtanzillo]

Looks great! 👍

[simaishi]

Hammer backport details:

$ git log -1
commit 8e31216c10fe109043267b82e0903ff0a1f2cb94
Author: Joe Rafaniello <jrafanie@users.noreply.github.com>
Date:   Fri Jun 14 10:51:10 2019 -0400

    Merge pull request #18867 from h-kataria/mixed_operator_conditions_fix
    
    assign value to a variable and return at the end.
    
    (cherry picked from commit 0466cd65679de80ca08eda54d6cccb2f6b0d49c9)
    
    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1720753

[martinpovolny]

why not just

result = exp.find { |e| exp_find_by_token(e, token) }

Am I missing something?